ocaml 3.09 transition

[helm.git] / helm / DEVEL / ocaml-http / Makefile

diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 3930ea14eb6b8a304bd757783e38450cbe4119c6..572a7f2584f050b328534219697c338a0c0f1e7b 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -29,10 +29,16 @@ opt_non_mt: http.cmxa
 all_mt: http_mt.cma
 opt_mt: http_mt.cmxa
 world: all opt
-doc: $(DOTDIR)/ocaml-http.ps $(TEXDIR)/ocaml-http.tex $(OCAMLDOC_STUFF)
+doc: all $(DOCDIR)/index.html $(DOTDIR)/ocaml-http.ps $(TEXDIR)/ocaml-http.ps $(OCAMLDOC_STUFF)
+$(DOCDIR)/index.html:
        $(OCAMLDOC) -html -d $(DOCDIR) $(OCAMLDOC_STUFF)
 $(TEXDIR)/ocaml-http.tex: $(OCAMLDOC_STUFF)
        $(OCAMLDOC) -latex -o $@ $^
+$(TEXDIR)/ocaml-http.ps: $(TEXDIR)/ocaml-http.tex
+       cd $(TEXDIR);           \
+       latex ocaml-http;       \
+       latex ocaml-http;       \
+       dvips ocaml-http
 $(DOTDIR)/ocaml-http.ps: $(DOTDIR)/ocaml-http.dot
        $(DOT) -Tps $< > $@
 $(DOTDIR)/ocaml-http.dot: *.ml *.mli
@@ -89,17 +95,21 @@ clean:
        done
        rm -f {mt,non_mt}/$(THREADED_SRV).mli
 docclean:
-       rm -f   \
+       -rm -f  \
                $(DOCDIR)/*.html $(DOCDIR)/*.css        \
                $(DOTDIR)/*.dot $(DOTDIR)/*.ps  \
-               $(TEXDIR)/*.tex
+               $(TEXDIR)/*.{dvi,ps,ps.gz,pdf,aux,log,out,toc,tmp,haux,sty,tex}
 distclean: clean
        $(MAKE) -C examples/ distclean
        rm -f META
 dist: distreal distrm
-distreal: distclean depend
+distdoc: all doc
        if [ -d $(DISTDIR) ]; then rm -rf $(DISTDIR); else true; fi
-       mkdir $(DISTDIR)
+       mkdir -p $(DISTDIR)/doc/
+       cp -r doc/html/ $(DISTDIR)/doc/
+       cp doc/dot/ocaml-http.ps $(DISTDIR)/doc/modules.ps
+       cp doc/latex/ocaml-http.ps $(DISTDIR)/doc/
+distreal: distdoc distclean depend
        for f in        \
                        $(patsubst %, %.ml, $(MODULES)) \
                        $(patsubst %, %.mli, $(MODULES) $(THREADED_SRV))        \
@@ -119,7 +129,7 @@ install: META
        $(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME)     \
                $(patsubst %, %.mli, $(PUBLIC_MODULES)) \
                $(patsubst %, %.cmi, $(PUBLIC_MODULES)) \
-               http{,_mt}.cm{,x}a http{,_mt}.a META
+               $(wildcard *.cma *.cmxa *.a) META
 
 .PHONY:        \
        all opt world all_non_mt all_mt opt_non_mt opt_mt       \