patched

[helm.git] / helm / ocaml / Makefile.in

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 0fb6d927aad6f9c4e9ff182122dfb3c21b7938eb..9ba9e8bd4f6c738ed206469c8cd10ead0e52a348 100644 (file)
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -31,6 +31,7 @@ CWD=`pwd`
 
 all: metas $(MODULES:%=%.all)
 opt: metas $(MODULES:%=%.opt)
+world: all opt
 metas: $(METAS)
 depend: $(MODULES:%=%.depend)
 install: $(MODULES:%=%.install)
@@ -38,10 +39,11 @@ uninstall: $(MODULES:%=%.uninstall)
 clean: $(MODULES:%=%.clean)
 clean_metas:
        rm -f $(METAS)
-
 distclean: clean clean_metas
        rm -f Makefile Makefile.common configure config.log config.cache config.status
 
+.PHONY: all opt world metas depend install uninstall clean clean_metas distclean
+
 $(MODULES:%=%.all):
        export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.all=%) && make all
 $(MODULES:%=%.opt):
@@ -51,7 +53,7 @@ $(MODULES:%=%.depend):
 $(MODULES:%=%.install):
        cd $(@:%.install=%) && make install
        export TARGET=$(OCAMLFIND_META_DIR)/$(@:%.install=META.helm-%) ; \
-       cp $(@:%.install=META.helm-%.src) $$TARGET && \
+       cp METAS/$(@:%.install=meta.helm-%.src) $$TARGET && \
        echo "directory=\"$(OCAMLFIND_DEST_DIR)/$(@:%.install=%)\"" >> $$TARGET
 $(MODULES:%=%.uninstall):
        cd $(@:%.uninstall=%) && make uninstall
@@ -73,8 +75,9 @@ METAS/META.helm-%: METAS/meta.helm-%.src
 .alldep.dot:
        echo "digraph G {" > $@
        echo "   rankdir = TB ;" >> $@
-       for i in $(MODULES); do ocamlfind query helm-$$i -recursive -p-format | sed "s/^/ \"helm-$$i\" -> \"/g" | sed "s/$$/\";/g" >> $@ ; done
+       for i in $(MODULES); do ocamlfind query helm-$$i -recursive -p-format | grep -v "pxp-" | sed "s/^pxp/pxp[-*]/g" | sed "s/^/ \"helm-$$i\" -> \"/g" | sed "s/$$/\";/g" >> $@ ; done
        mv $@ $@.old ; ./simplify_deps/simplify_deps.opt < $@.old > $@ ; rm $@.old
+       for i in $(MODULES); do echo "\"helm-$$i\" [shape=box,style=filled,fillcolor=yellow];" >> $@ ; done
        echo "}" >> $@