X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=af543d640ea7f471d54b2c39effb3d0a64385c22;hb=b5619c04607ec92594e7645847409c351129709b;hp=6d32e6eb749f669fc05e317b2a5cecb431d18ada;hpb=c1f74c5fe5c69d3d830f6a58bc0e20c99d1fa8f7;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 6d32e6eb7..af543d640 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -36,18 +36,11 @@ endif
 # objects for matita (GTK GUI)
 CMOS =				\
 	buildTimeConf.cmo	\
-	matitaLog.cmo		\
 	matitaTypes.cmo		\
-	matitaMoo.cmo		\
 	matitaMisc.cmo		\
-	matitaDb.cmo		\
 	matitamakeLib.cmo	\
 	matitaInit.cmo		\
-	disambiguatePp.cmo	\
-	matitaSync.cmo		\
-	matitaDisambiguator.cmo	\
 	matitaExcPp.cmo 	\
-	matitacleanLib.cmo	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
 	matitaScript.cmo	\
@@ -60,18 +53,11 @@ CMOS =				\
 # objects for matitac (batch compiler)
 CCMOS =				\
 	buildTimeConf.cmo	\
-	matitaLog.cmo		\
 	matitaTypes.cmo		\
-	matitaMoo.cmo		\
 	matitaMisc.cmo		\
-	matitaDb.cmo		\
 	matitamakeLib.cmo	\
 	matitaInit.cmo		\
-	disambiguatePp.cmo	\
-	matitaSync.cmo		\
-	matitaDisambiguator.cmo	\
 	matitaExcPp.cmo 	\
-	matitacleanLib.cmo	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
 	$(NULL)
@@ -84,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
@@ -114,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)
 
@@ -154,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
@@ -212,31 +197,28 @@ clean:
 		$(PROGRAMS_UPX) \
 		$(NULL)
 
-tests: matitac matitadep matitaclean
-	@-(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 -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)
-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)
+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
 
@@ -278,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)