ocaml 3.09 transition

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

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 2e678c9d8305e4ba7c277d531345fd50b97563f0..93172fdd6c20b1cae35ade719d872b1d7d366d5f 100644 (file)
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,35 +1,32 @@
 # Warning: the modules must be in compilation order
+NULL =
 MODULES =                      \
-       pxp                     \
+       extlib                  \
+       xml                     \
        registry                \
+       hmysql                  \
        utf8_macros             \
        thread                  \
        xmldiff                 \
-       xml                     \
        urimanager              \
        logger                  \
        getter                  \
        cic                     \
-       cic_annotations         \
        cic_proof_checking      \
-       cic_textual_parser      \
-       tex_cic_textual_parser  \
        cic_unification         \
-       mathql                  \
-       mathql_generator        \
-       mathql_interpreter      \
        cic_omdoc               \
        metadata                \
        tactics                 \
-       hbugs                   \
+       cic_notation            \
        cic_transformations     \
-       cic_textual_parser2
+       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)
@@ -46,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-%) ; \
@@ -60,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:
@@ -82,9 +80,14 @@ METAS/META.helm-%: METAS/meta.helm-%.src
        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 .
+