community review, solved a couple of TODO

[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 5a5e2138958e132df16839af94d462667cb65a87..bb96479261bf029663ff76fbc84d4a0fb8a126cc 100644 (file)
--- a/helm/ocaml/cic_proof_checking/Makefile
+++ b/helm/ocaml/cic_proof_checking/Makefile
@@ -1,15 +1,20 @@
 
 PACKAGE = cic_proof_checking
-REQUIRES = helm-cic helm-logger helm-getter helm-xml pxp
 PREDICATES =
 
 REDUCTION_IMPLEMENTATION = cicReductionMachine.ml
 
 INTERFACE_FILES = \
        cicLogger.mli \
-       cicEnvironment.mli cicUnivUtils.mli cicPp.mli cicSubstitution.mli \
-       cicMiniReduction.mli cicReductionNaif.mli cicReduction.mli \
-       cicTypeChecker.mli
+       cicEnvironment.mli \
+       cicPp.mli \
+       cicUnivUtils.mli \
+       cicSubstitution.mli \
+       cicMiniReduction.mli \
+       cicReduction.mli \
+       cicTypeChecker.mli \
+        freshNamesGenerator.mli \
+       $(NULL)
 IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
 
 # Metadata tools only need zeta-reduction
@@ -20,11 +25,18 @@ EXTRA_OBJECTS_TO_CLEAN =
 
 include ../Makefile.common
 
-cicReduction.ml: $(REDUCTION_IMPLEMENTATION)
-       if ! [ -f $@ ]; then \
-               echo "Using $< for $@"; \
-               ln -s $< $@;    \
-       else    \
-               true;   \
-       fi
+cicReduction.cmo: OCAMLOPTIONS+=-rectypes
+cicReduction.cmx: OCAMLOPTIONS+=-rectypes
+
+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