X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.in;h=1833ece7789f55f6f31ac5ef70892580eff3cb9a;hb=78cf601fd8b8dbb386b0db315dcbfdbe8256c15f;hp=8eae888141a87c4da2d1f49f9d02020acc18a5c3;hpb=4bcd14a9ed245ccae631697a05ff5a377c02b179;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 8eae88814..1833ece77 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,26 +1,49 @@
 # 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_interpreter \
-          mathql_generator cic_omdoc tactics cic_transformations
+MODULES = \
+	registry \
+	thread \
+	xml \
+	urimanager \
+	logger \
+	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 \
+	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):
@@ -37,8 +60,8 @@ $(MODULES:%=%.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:
@@ -48,5 +71,18 @@ META.helm-%: META.helm-%.src
 	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 $@ $<