X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.in;h=1f47f94817d0915f6331f8fb6aef38876e93859b;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=c53a83b5a660cd9d963d733ff429505585505ebb;hpb=0386e72a92dea47cb86356e71698bab3ecb65c51;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index c53a83b5a..1f47f9481 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,27 +1,50 @@
 # 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 \
-	  cic_textual_parser2 \
-          tex_cic_textual_parser cic_unification mathql mathql_generator \
-	  mathql_interpreter cic_omdoc tactics cic_transformations
+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@
 OCAMLFIND_META_DIR = @OCAMLFIND_META_DIR@
 
-METAS = $(MODULES:%=META.helm-%)
+METAS = $(MODULES:%=METAS/META.helm-%)
 CWD=`pwd`
 
-all: $(METAS) $(MODULES:%=%.all)
-opt: $(METAS) $(MODULES:%=%.opt)
+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:
 	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):
@@ -31,23 +54,36 @@ $(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
 	rm -f $(OCAMLFIND_META_DIR)/$(@:%.uninstall=META.helm-%)
 $(MODULES:%=%.clean):
 	cd $(@:%.clean=%) && make clean
-META.helm-%: META.helm-%.src
-	cp $< $@ && echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@
+METAS/META.helm-%: METAS/meta.helm-%.src
+	cp $< $@ && echo "directory=\"$(CWD)/$*\"" >> $@
 
 .PHONY: .dep.dot
 .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 $@ $<