X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.in;h=be300223ddc0f4b5e992e6a42990a9470d05d8ce;hb=4cb4d286a1fdcb150c2848a9d21ac3486906c317;hp=4f745c833c9a20409766bf2441d677eb048be345;hpb=53875b9ed0b9fe06786c596c8be707740b154948;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 4f745c833..be300223d 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,26 +1,26 @@
 # Warning: the modules must be in compilation order
-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 \
+MODULES =			\
+	pxp			\
+	registry		\
+	utf8_macros		\
+	thread			\
+	xmldiff			\
+	xml			\
+	urimanager		\
+	logger			\
+	getter			\
+	cic			\
+	cic_annotations		\
+	cic_proof_checking	\
+	cic_unification		\
+	mathql			\
+	mathql_generator	\
+	mathql_interpreter	\
+	cic_omdoc		\
+	metadata		\
+	tactics			\
+	hbugs			\
+	cic_transformations	\
 	cic_textual_parser2
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
@@ -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
@@ -65,7 +67,7 @@ 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 "}" >> $@
 
@@ -73,7 +75,7 @@ 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 | grep -v "pxp-" | sed "s/^pxp/pxp[-*]/g" | 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 "}" >> $@