X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.in;h=b6b3bd0d7da7188fbd7f544083fb8d39618dd029;hb=76a45dfa7d4a7708797930f8c9025f63a66910cb;hp=ac2a057f34e23ed5f9162138035c99c7cc198f92;hpb=31afc64440b7da53bb79e6f1524d47bf0fb56aaf;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index ac2a057f3..b6b3bd0d7 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,7 +1,7 @@
 # Warning: the modules must be in compilation order
+NULL =
 MODULES =			\
 	xml			\
-	pxp			\
 	registry		\
 	utf8_macros		\
 	thread			\
@@ -10,7 +10,6 @@ MODULES =			\
 	logger			\
 	getter			\
 	cic			\
-	cic_annotations		\
 	cic_proof_checking	\
 	cic_unification		\
 	cic_omdoc		\
@@ -19,13 +18,12 @@ MODULES =			\
 	cic_transformations	\
 	cic_notation		\
 	cic_textual_parser2	\
-	hbugs			
+	$(NULL)
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
-OCAMLFIND_META_DIR = @OCAMLFIND_META_DIR@
+OCAMLPATH = @OCAMLFIND_META_DIR@
 
 METAS = $(MODULES:%=METAS/META.helm-%)
-CWD=`pwd`
 
 all: metas $(MODULES:%=%.all)
 opt: metas $(MODULES:%=%.opt)
@@ -34,7 +32,7 @@ metas: $(METAS)
 depend: $(MODULES:%=%.depend)
 install: $(MODULES:%=%.install)
 uninstall: $(MODULES:%=%.uninstall)
-clean: clean_metas $(MODULES:%=%.clean)
+clean: $(MODULES:%=%.clean)
 clean_metas:
 	rm -f $(METAS)
 distclean: clean clean_metas
@@ -42,12 +40,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-%) ; \
@@ -56,10 +57,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: