ocaml 3.09 transition

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

diff --git a/helm/ocaml/cic_proof_checking/Makefile b/helm/ocaml/cic_proof_checking/Makefile
index c8828a22476267d1fb6a4ceb8c8c54b2e61c3fe6..352a53016d6b5b2aa28a407a1a2a755c086b47ab 100644 (file)
--- a/helm/ocaml/cic_proof_checking/Makefile
+++ b/helm/ocaml/cic_proof_checking/Makefile
@@ -1,6 +1,6 @@
 
 PACKAGE = cic_proof_checking
-REQUIRES = helm-cic helm-logger helm-getter helm-xml pxp
+REQUIRES = helm-cic helm-logger helm-getter helm-xml
 PREDICATES =
 
 REDUCTION_IMPLEMENTATION = cicReductionMachine.ml
@@ -8,14 +8,15 @@ REDUCTION_IMPLEMENTATION = cicReductionMachine.ml
 INTERFACE_FILES = \
        cicLogger.mli \
        cicEnvironment.mli \
-       cicUnivUtils.mli \
        cicPp.mli \
+       cicUnivUtils.mli \
        cicSubstitution.mli \
        cicMiniReduction.mli \
-       cicReductionNaif.mli \
        cicReduction.mli \
        cicTypeChecker.mli \
-       cicElim.mli
+        freshNamesGenerator.mli \
+       cicElim.mli     \
+       cicRecord.mli
 IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
 
 # Metadata tools only need zeta-reduction
@@ -26,11 +27,15 @@ EXTRA_OBJECTS_TO_CLEAN =
 
 include ../Makefile.common
 
-cicReduction.ml: $(REDUCTION_IMPLEMENTATION)
-       if ! [ -f $@ ]; then \
-               echo "Using $< for $@"; \
-               ln -s $< $@;    \
-       else    \
-               true;   \
-       fi
+all: all_utilities
+opt: opt_utilities
+
+all_utilities:
+       $(MAKE) -C utilities/ all
+opt_utilities:
+       $(MAKE) -C utilities/ opt
+
+clean: clean_utilities
+clean_utilities:
+       $(MAKE) -C utilities/ clean