added generation of dot modules dependency graph

diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 90ab28781a500ab06f3721cc8ce253d47feabf9b..65624e831b4980ed3d3280652d808b52c9712035 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -9,6 +9,9 @@ MODULES_MT = $(patsubst http_tcp_server, mt/$(THREADED_SRV) http_tcp_server, $(M
 MODULES_NON_MT = $(patsubst http_tcp_server, non_mt/$(THREADED_SRV) http_tcp_server, $(MODULES))
 PUBLIC_MODULES = http_common http_request http_daemon http_response
 PUBLIC_IMPL = http_types
+OCAMLDOC_STUFF = *.mli $(patsubst %, %.ml, $(PUBLIC_IMPL))
+DOCDIR = doc/html
+DOTDIR = doc/dot
 DESTDIR = $(shell $(OCAMLFIND) printconf stdlib) 
 
 all: all_non_mt all_mt
@@ -18,9 +21,13 @@ opt_non_mt: http.cmxa
 all_mt: http_mt.cma
 opt_mt: http_mt.cmxa
 world: all opt
-doc: *.mli
-       $(OCAMLDOC) -html -d doc/html   \
-               *.mli $(patsubst %, %.ml, $(PUBLIC_IMPL))
+doc: dot $(OCAMLDOC_STUFF)
+       $(OCAMLDOC) -html -d $(DOCDIR) $(OCAMLDOC_STUFF)
+dot: $(DOTDIR)/ocaml-http.ps
+$(DOTDIR)/ocaml-http.ps: $(DOTDIR)/ocaml-http.dot
+       $(DOT) -Tps $< > $@
+$(DOTDIR)/ocaml-http.dot: *.ml *.mli
+       $(OCAMLDOC) -dot -o $(DOTDIR)/ocaml-http.dot *.ml *.mli
 
 examples:
        $(MAKE) -C examples/
@@ -74,10 +81,10 @@ clean:
        done
        rm -f {mt,non_mt}/$(THREADED_SRV).mli
 docclean:
-       rm -f doc/html/*.html doc/html/*.css
+       rm -f $(DOCDIR)/*.html $(DOCDIR)/*.css $(DOTDIR)/*.dot $(DOTDIR)/*.ps
 distclean: clean docclean
        $(MAKE) -C examples/ distclean
-       -rm -f META
+       rm -f META
 dist: distreal distrm
 distreal: distclean depend
        if [ -d $(DISTDIR) ]; then rm -rf $(DISTDIR); else true; fi
@@ -108,5 +115,5 @@ install: META
 .PHONY:        \
        all opt world all_non_mt all_mt opt_non_mt opt_mt       \
        examples examples.opt depend clean distclean dist       \
-       install meta doc deb distreal distrm
+       install meta doc deb distreal distrm dot
 

diff --git a/helm/DEVEL/ocaml-http/Makefile.defs b/helm/DEVEL/ocaml-http/Makefile.defs
index 642a7acb5fbd5f7cd42b488695067a80dcad3e74..6fd4b75f8999db82eecdaa2d4be88c27cc80cf2a 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile.defs
+++ b/helm/DEVEL/ocaml-http/Makefile.defs
@@ -9,7 +9,12 @@ OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(COMMON_FLAGS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMON_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMON_FLAGS)
-OCAMLDOC := ocamldoc -I $(shell $(OCAMLFIND) query netstring)
+OCAMLDOC :=    \
+       ocamldoc        \
+               $(shell $(OCAMLFIND) query -i-format unix)      \
+               $(shell $(OCAMLFIND) query -i-format pcre)      \
+               $(shell $(OCAMLFIND) query -i-format netstring)
+DOT = dot
 
 DISTNAME = ocaml-http
 DISTDIR = $(DISTNAME)-$(DISTVERSION)