- added helm- modules dependencies

- added ocamldoc generation of .dot modules dependency graph

diff --git a/helm/hbugs/common/Makefile b/helm/hbugs/common/Makefile
index 0e25d75e1c115df6867a93545de6cf24587b94b8..3a3d96821d8a2f8f0b1f5e622254569590a761a0 100644 (file)
--- a/helm/hbugs/common/Makefile
+++ b/helm/hbugs/common/Makefile
@@ -1,11 +1,20 @@
-REQUIRES = pcre pxp http
+REQUIRES = helm-xml helm-pxp pcre pxp http
 COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc $(COMMONOPTS)
-OCAMLOPT = ocamlfind ocamlopt $(COMMONOPTS)
-OCAMLDEP = ocamlfind ocamldep $(COMMONOPTS)
+OCAMLFIND = ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc $(COMMONOPTS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMONOPTS)
+OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMONOPTS)
+OCAMLDOC =     \
+       ocamldoc        \
+               $(shell $(OCAMLFIND) query -i-format helm-xml)  \
+               $(shell $(OCAMLFIND) query -i-format helm-pxp)  \
+               $(shell $(OCAMLFIND) query -i-format pcre)      \
+               $(shell $(OCAMLFIND) query -i-format pxp-engine)        \
+               $(shell $(OCAMLFIND) query -i-format threads)   \
+               $(shell $(OCAMLFIND) query -i-format http)
 MODULES =      \
        hbugs_types threadSafe hbugs_misc       \
-       hbugs_id_generator hbugs_messages
+       hbugs_common hbugs_id_generator hbugs_messages
 
 OBJS = $(patsubst %,%.cmo,$(MODULES))
 OBJSOPT = $(patsubst %,%.cmx,$(MODULES))
@@ -15,6 +24,9 @@ byte: $(OBJS)
 opt: $(OBJSOPT)
 world: byte opt
 
+hbugs_common.dot: *.ml *.mli
+       $(OCAMLDOC) -dot -o $@ $^
+
 include .depend
 depend:
        $(OCAMLDEP) *.ml *.mli > .depend