ocaml 3.09 transition

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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index b7b85ad4b981d3be007d6d132aef3bdeebebd722..127f8a407638086f975ada39664ed1da040f4253 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -27,7 +27,7 @@ OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
 
-MATITA_FLAGS =
+MATITA_FLAGS = -noprofile
 NODB=false
 ifeq ($(NODB),true)
        MATITA_FLAGS += -nodb
@@ -39,14 +39,14 @@ CMOS =                              \
        matitaLog.cmo           \
        matitaTypes.cmo         \
        matitaMoo.cmo           \
-       matitaExcPp.cmo         \
        matitaMisc.cmo          \
        matitaDb.cmo            \
        matitamakeLib.cmo       \
        matitaInit.cmo  \
        matitaSync.cmo          \
-       matitacleanLib.cmo      \
        matitaDisambiguator.cmo \
+       matitaExcPp.cmo         \
+       matitacleanLib.cmo      \
        matitaEngine.cmo        \
        matitacLib.cmo          \
        matitaScript.cmo        \
@@ -61,13 +61,13 @@ CCMOS =                             \
        matitaLog.cmo           \
        matitaTypes.cmo         \
        matitaMoo.cmo           \
-       matitaExcPp.cmo         \
        matitaMisc.cmo          \
        matitaDb.cmo            \
        matitamakeLib.cmo       \
        matitaInit.cmo \
        matitaSync.cmo          \
        matitaDisambiguator.cmo \
+       matitaExcPp.cmo         \
        matitacleanLib.cmo      \
        matitaEngine.cmo        \
        matitacLib.cmo          \
@@ -210,21 +210,30 @@ clean:
                $(NULL)
 
 tests: matitac matitadep matitaclean
-       @(cd library && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null" clean all)
-       @(cd tests && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null" clean all)
-       @(cd contribs/LAMBDA-TYPES && make MATITAC="- ../../scripts/do_tests.sh $(DO_TESTS_OPTS) ../../matitac ../../matitaclean /dev/null" clean all)
-       @(cd contribs/PREDICATIVE-TOPOLOGY && make MATITAC="- ../../scripts/do_tests.sh $(DO_TESTS_OPTS) ../../matitac ../../matitaclean /dev/null" clean all)
+       @-(cd library && make -k clean all)
+       @-(cd tests && make -k clean all)
+       @-(cd tests/bad_tests && make -k clean all)
+       @-(cd contribs/LAMBDA-TYPES && make -k clean all)
+       @-(cd contribs/PREDICATIVE-TOPOLOGY && make -k clean all)
 tests.opt: matitac.opt matitadep.opt matitaclean.opt
-       @(cd library && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null" clean.opt opt)
-       @(cd tests && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null" clean.opt opt)
-       @(cd contribs/LAMBDA-TYPES && make MATITAC="- ../../scripts/do_tests.sh $(DO_TESTS_OPTS) ../../matitac.opt ../../matitaclean.opt /dev/null" clean.opt opt)
-       @(cd contribs/PREDICATIVE-TOPOLOGY && make MATITAC="- ../../scripts/do_tests.sh $(DO_TESTS_OPTS) ../../matitac.opt ../../matitaclean.opt /dev/null" clean.opt opt)
+       @-(cd library && make -k clean.opt opt)
+       @-(cd tests && make -k clean.opt opt)
+       @-(cd tests/bad_tests && make -k clean.opt opt)
+       @-(cd contribs/LAMBDA-TYPES && make -k clean.opt opt)
+       @-(cd contribs/PREDICATIVE-TOPOLOGY && make -k clean.opt opt)
 cleantests: matitaclean
        @(cd library && make clean)
        @(cd tests && make clean)
+       @(cd tests/bad_tests && make clean)
        @(cd contribs/LAMBDA-TYPES && make clean)
        @(cd contribs/PREDICATIVE-TOPOLOGY && make clean)
-.PHONY: tests tests.opt cleantests
+cleantests.opt: matitaclean.opt
+       @(cd library && make clean.opt)
+       @(cd tests && make clean.opt)
+       @(cd tests/bad_tests && make clean)
+       @(cd contribs/LAMBDA-TYPES && make clean.opt)
+       @(cd contribs/PREDICATIVE-TOPOLOGY && make clean.opt)
+.PHONY: tests tests.opt cleantests cleantests.opt
 
 # {{{ Distribution stuff