X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FMakefile.in;h=af543d640ea7f471d54b2c39effb3d0a64385c22;hb=efec9dde0ebb9ea6b8d8556b92bc0173dcab2cb7;hp=b7b85ad4b981d3be007d6d132aef3bdeebebd722;hpb=2f647b0a312dce84b6a922676a4e213aa440bd1c;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index b7b85ad4b..af543d640 100644
--- 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
@@ -36,39 +36,28 @@ endif
 # objects for matita (GTK GUI)
 CMOS =				\
 	buildTimeConf.cmo	\
-	matitaLog.cmo		\
 	matitaTypes.cmo		\
-	matitaMoo.cmo		\
-	matitaExcPp.cmo 	\
 	matitaMisc.cmo		\
-	matitaDb.cmo		\
 	matitamakeLib.cmo	\
-	matitaInit.cmo	\
-	matitaSync.cmo		\
-	matitacleanLib.cmo	\
-	matitaDisambiguator.cmo	\
+	matitaInit.cmo		\
+	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
 	matitaGtkMisc.cmo	\
+	applyTransformation.cmo	\
 	matitaMathView.cmo 	\
 	matitaGui.cmo		\
 	$(NULL)
 # objects for matitac (batch compiler)
 CCMOS =				\
 	buildTimeConf.cmo	\
-	matitaLog.cmo		\
 	matitaTypes.cmo		\
-	matitaMoo.cmo		\
-	matitaExcPp.cmo 	\
 	matitaMisc.cmo		\
-	matitaDb.cmo		\
 	matitamakeLib.cmo	\
-	matitaInit.cmo \
-	matitaSync.cmo		\
-	matitaDisambiguator.cmo	\
-	matitacleanLib.cmo	\
+	matitaInit.cmo		\
+	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
 	$(NULL)
@@ -81,7 +70,6 @@ DEPCMOS = $(CCMOS)
 CLEANCMOS = $(CCMOS)
 MAKECMOS = \
 	buildTimeConf.cmo	\
-	matitaLog.cmo		\
 	matitamakeLib.cmo	\
 	$(NULL)
 PROGRAMS_BYTE = matita matitac cicbrowser matitadep matitaclean matitamake dump_moo
@@ -111,10 +99,10 @@ matita.conf.xml.sample: matita.conf.xml.sample.in
 	@echo "WARNING: The configuration sample file has changed!"
 	@echo 
 
-coq.moo: coq.ma matitac
-	./matitac $(MATITA_FLAGS) coq.ma
-coq.moo.opt: coq.ma matitac.opt
-	./matitac.opt $(MATITA_FLAGS) coq.ma
+coq.moo: library/legacy/coq.ma matitac
+	./matitac $(MATITA_FLAGS) $<
+coq.moo.opt: library/legacy/coq.ma matitac.opt
+	./matitac.opt $(MATITA_FLAGS) $<
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 
@@ -151,9 +139,9 @@ matita: $(LIB_DEPS) $(CMOS) matita.ml
 matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
 	$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml
 
-dump_moo: buildTimeConf.cmo matitaLog.cmo matitaMoo.cmo dump_moo.ml
+dump_moo: buildTimeConf.cmo dump_moo.ml
 	$(OCAMLC) $(PKGS) -linkpkg -o $@ $^
-dump_moo.opt: buildTimeConf.cmx matitaLog.cmx matitaMoo.cmx dump_moo.ml
+dump_moo.opt: buildTimeConf.cmx dump_moo.ml
 	$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $^
 
 matitac: $(CLIB_DEPS) $(CCMOS) $(MAINCMOS) matitac.ml
@@ -209,22 +197,28 @@ clean:
 		$(PROGRAMS_UPX) \
 		$(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)
-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)
-cleantests: matitaclean
-	@(cd library && make clean)
-	@(cd tests && make clean)
-	@(cd contribs/LAMBDA-TYPES && make clean)
-	@(cd contribs/PREDICATIVE-TOPOLOGY && make clean)
-.PHONY: tests tests.opt cleantests
+TEST_DIRS = 				\
+	library 			\
+	tests 				\
+	tests/bad_tests 		\
+	contribs/LAMBDA-TYPES 		\
+	contribs/PREDICATIVE-TOPOLOGY 	\
+	$(NULL)
+
+.PHONY: tests tests.opt cleantests cleantests.opt
+tests: $(foreach d,$(TEST_DIRS),$(d)-test)
+tests.opt: $(foreach d,$(TEST_DIRS),$(d)-test-opt)
+cleantests: $(foreach d,$(TEST_DIRS),$(d)-cleantests)
+cleantests.opt: $(foreach d,$(TEST_DIRS),$(d)-cleantests-opt)
+
+%-test: matitac matitadep matitaclean coq.moo
+	-cd $* && make -k clean all
+%-test-opt: matitac.opt matitadep.opt matitaclean.opt coq.moo.opt
+	-cd $* && make -k clean.opt opt
+%-cleantests: matitaclean
+	-cd $* && make clean
+%-cleantests-opt: matitaclean.opt
+	-cd $* && make clean.opt
 
 # {{{ Distribution stuff
 
@@ -266,7 +260,7 @@ matita.opt.static: $(STATIC_LINK) $(LIBX_DEPS) $(CMXS) matita.ml
 		$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml \
 		$(STATIC_EXTRA_LIBS)
 	strip $@
-dump_moo.opt.static: $(STATIC_LINK) buildTimeConf.cmx matitaLog.cmx matitaMoo.cmx dump_moo.ml
+dump_moo.opt.static: $(STATIC_LINK) buildTimeConf.cmx dump_moo.ml
 	$(STATIC_LINK) $(STATIC_CLIBS) -- \
 		$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $^ \
 		$(STATIC_EXTRA_CLIBS)