X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2FMakefile.in;h=00b5b0dd2b80d290c3ded9415d113a2ac3dd7334;hb=9d8e81db720417f58591ea42f72c6750b886a83d;hp=b4b99eb24fcb4328c33e6df45d012479ae45b7ea;hpb=3c0e1daa549d80d28caf54b8e0f1f019a5a83ac5;p=helm.git

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index b4b99eb24..00b5b0dd2 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,25 +10,22 @@ MODULES =			\
 	logger			\
 	getter			\
 	cic			\
-	cic_annotations		\
 	cic_proof_checking	\
 	cic_unification		\
 	cic_omdoc		\
 	metadata		\
 	tactics			\
-	cic_notation		\
 	cic_transformations	\
+	cic_notation		\
 	cic_textual_parser2	\
-	mathql			\
-	mathql_interpreter	\
-	mathql_generator	\
-	hbugs			
+	$(NULL)
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 OCAMLFIND_META_DIR = @OCAMLFIND_META_DIR@
 
 METAS = $(MODULES:%=METAS/META.helm-%)
-CWD=`pwd`
+CWD := $(shell pwd)
+OCAMLPATH = $(CWD)/METAS/
 
 all: metas $(MODULES:%=%.all)
 opt: metas $(MODULES:%=%.opt)
@@ -37,7 +34,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
@@ -45,12 +42,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,8 +59,6 @@ $(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)/$*\"" >> $@