ocaml 3.09 transition

[helm.git] / helm / ocaml / Makefile.in

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index af199d3b5b9b7379d63f7e2c9152a30187413b41..93172fdd6c20b1cae35ade719d872b1d7d366d5f 100644 (file)
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,8 +1,10 @@
 # Warning: the modules must be in compilation order
+NULL =
 MODULES =                      \
+       extlib                  \
        xml                     \
-       pxp                     \
        registry                \
+       hmysql                  \
        utf8_macros             \
        thread                  \
        xmldiff                 \
@@ -10,7 +12,6 @@ MODULES =                     \
        logger                  \
        getter                  \
        cic                     \
-       cic_annotations         \
        cic_proof_checking      \
        cic_unification         \
        cic_omdoc               \
@@ -18,17 +19,14 @@ MODULES =                   \
        tactics                 \
        cic_notation            \
        cic_transformations     \
-       cic_textual_parser2     \
-       mathql                  \
-       mathql_interpreter      \
-       mathql_generator        \
-       hbugs                   
+       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)
@@ -45,12 +43,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 +60,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: