X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.in;h=93172fdd6c20b1cae35ade719d872b1d7d366d5f;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=1833ece7789f55f6f31ac5ef70892580eff3cb9a;hpb=0ef1e1ba509946f79ff975e9048f0ccc6f053784;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 1833ece77..93172fdd6 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,33 +1,32 @@
 # 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 \
-	cic_textual_parser2
+NULL =
+MODULES =			\
+	extlib			\
+	xml			\
+	registry		\
+ 	hmysql 			\
+	utf8_macros		\
+	thread			\
+	xmldiff			\
+	urimanager		\
+	logger			\
+	getter			\
+	cic			\
+	cic_proof_checking	\
+	cic_unification		\
+	cic_omdoc		\
+	metadata		\
+	tactics			\
+	cic_notation		\
+	cic_transformations	\
+	cic_disambiguation	\
+	paramodulation		\
+	$(NULL)
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
-OCAMLFIND_META_DIR = @OCAMLFIND_META_DIR@
+OCAMLPATH = @OCAMLFIND_META_DIR@
 
-METAS = $(MODULES:%=METAS/META.helm-%)
-CWD=`pwd`
+METAS = $(MODULES:%=METAS/META.helm-%) METAS/META.helm-cic_disambiguation
 
 all: metas $(MODULES:%=%.all)
 opt: metas $(MODULES:%=%.opt)
@@ -44,30 +43,31 @@ distclean: clean clean_metas
 
 .PHONY: all opt world metas depend install uninstall clean clean_metas distclean
 
-$(MODULES:%=%.all):
-	export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.all=%) && make all
-$(MODULES:%=%.opt):
-	export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.opt=%) && make opt
-$(MODULES:%=%.depend):
-	export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.depend=%) && make depend
+%.all:
+	OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* all
+%.opt:
+	OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* opt
+%.clean:
+	OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* clean
+%.depend:
+	OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* 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
 METAS/META.helm-%: METAS/meta.helm-%.src
-	cp $< $@ && echo "directory=\"$(CWD)/$*\"" >> $@
+	cp $< $@ && echo "directory=\"$(shell pwd)/$*\"" >> $@
 
 .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 "}" >> $@
 
@@ -75,14 +75,19 @@ 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 "}" >> $@
 
-
 libraries.ps: .dep.dot
 	dot -Tps -o $@ $<
 
 libraries-complete.ps: .alldep.dot
 	dot -Tps -o $@ $<
+
+tags: TAGS
+.PHONY: TAGS
+TAGS:
+	otags -vi -r .
+