X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.in;h=3dabc3ad4b99185e7ad8c0d932e04c2b532da14d;hb=9b8a57ace85bca07520ba9434e67051d86e492f6;hp=af199d3b5b9b7379d63f7e2c9152a30187413b41;hpb=879797d6505bc39489009d9ae1e2506022bde9e2;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index af199d3b5..3dabc3ad4 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,8 +1,11 @@
 # Warning: the modules must be in compilation order
+NULL =
 MODULES =			\
+	extlib			\
 	xml			\
-	pxp			\
+	hgdome			\
 	registry		\
+ 	hmysql 			\
 	utf8_macros		\
 	thread			\
 	xmldiff			\
@@ -10,25 +13,27 @@ MODULES =			\
 	logger			\
 	getter			\
 	cic			\
-	cic_annotations		\
 	cic_proof_checking	\
-	cic_unification		\
-	cic_omdoc		\
+	cic_acic		\
+	acic_content		\
+	content_pres		\
+	grafite			\
 	metadata		\
+	library			\
+	cic_unification		\
+	whelp			\
 	tactics			\
-	cic_notation		\
-	cic_transformations	\
-	cic_textual_parser2	\
-	mathql			\
-	mathql_interpreter	\
-	mathql_generator	\
-	hbugs			
+	paramodulation		\
+	cic_disambiguation	\
+	grafite2                \
+	grafite_parser          \
+	$(NULL)
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
-OCAMLFIND_META_DIR = @OCAMLFIND_META_DIR@
+OCAMLPATH = @OCAMLFIND_META_DIR@
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
 
-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)
@@ -45,12 +50,15 @@ 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-%) ; \
@@ -59,10 +67,8 @@ $(MODULES:%=%.install):
 $(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:
@@ -81,9 +87,13 @@ METAS/META.helm-%: METAS/meta.helm-%.src
 	for i in $(MODULES); do echo "\"helm-$$i\" [shape=box,style=filled,fillcolor=yellow];" >> $@ ; done
 	echo "}" >> $@
 
+.extdep.dot: .dep.dot
+	./patch_deps.sh $< $@
+
 libraries.ps: .dep.dot
 	dot -Tps -o $@ $<
-
+libraries-ext.ps: .extdep.dot
+	dot -Tps -o $@ $<
 libraries-complete.ps: .alldep.dot
 	dot -Tps -o $@ $<