X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.in;h=1f47f94817d0915f6331f8fb6aef38876e93859b;hb=0bdb4b19d800f2e0d6a65dd8a9194bec3124b8ae;hp=ec30fb868343eff2ed0920b63ba7a7a7d6628656;hpb=4a671a60ba714f60b86d8ce02ff022899d6e52b7;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index ec30fb868..1f47f9481 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,24 +1,27 @@
 # Warning: the modules must be in compilation order
-MODULES = \
-	xml \
-	urimanager \
-	getter \
-	pxp \
-	cic \
-	cic_annotations \
-	cic_annotations_cache \
-	cic_cache \
-	cic_proof_checking \
-	cic_textual_parser \
-	tex_cic_textual_parser \
-	cic_unification \
-	mathql \
-	mathql_generator \
-	mathql_interpreter \
-	cic_omdoc \
-	tactics \
-	cic_transformations \
-	logger \
+MODULES =			\
+	pxp			\
+	registry		\
+	thread			\
+	xml			\
+	urimanager		\
+	logger			\
+	getter			\
+	cic			\
+	cic_annotations		\
+	cic_annotations_cache	\
+	cic_cache		\
+	cic_proof_checking	\
+	cic_textual_parser	\
+	tex_cic_textual_parser	\
+	cic_unification		\
+	mathql			\
+	mathql_generator	\
+	mathql_interpreter	\
+	cic_omdoc		\
+	tactics			\
+	hbugs			\
+	cic_transformations	\
 	cic_textual_parser2
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
@@ -29,17 +32,19 @@ CWD=`pwd`
 
 all: metas $(MODULES:%=%.all)
 opt: metas $(MODULES:%=%.opt)
+world: all opt
 metas: $(METAS)
 depend: $(MODULES:%=%.depend)
 install: $(MODULES:%=%.install)
 uninstall: $(MODULES:%=%.uninstall)
-clean: $(MODULES:%=%.clean) clean_metas
+clean: $(MODULES:%=%.clean)
 clean_metas:
 	rm -f $(METAS)
-
-dist-clean: clean
+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):
@@ -49,7 +54,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
@@ -63,9 +68,22 @@ METAS/META.helm-%: METAS/meta.helm-%.src
 .dep.dot:
 	echo "digraph G {" > $@
 	echo "   rankdir = TB ;" >> $@
-	for i in $(MODULES); do ocamlfind query helm-$$i -recursive -p-format | grep helm | sed "s/^helm-/ \"$$i\" -> \"/g" | sed "s/$$/\";/g" >> $@ ; done
+	for i in $(MODULES); do $(OCAMLFIND) query helm-$$i -recursive -p-format | grep helm | sed "s/^helm-/ \"$$i\" -> \"/g" | sed "s/$$/\";/g" >> $@ ; done
+	mv $@ $@.old ; ./simplify_deps/simplify_deps.opt < $@.old > $@ ; rm $@.old
+	echo "}" >> $@
+
+.PHONY: .alldep.dot
+.alldep.dot:
+	echo "digraph G {" > $@
+	echo "   rankdir = TB ;" >> $@
+	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 "}" >> $@
 
+
 libraries.ps: .dep.dot
 	dot -Tps -o $@ $<
+
+libraries-complete.ps: .alldep.dot
+	dot -Tps -o $@ $<