X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=af543d640ea7f471d54b2c39effb3d0a64385c22;hb=782253ebe87375f52c07899c1501db5a665a457f;hp=32eccedd461f90874f8b6dfc3e7ac2a7ad6b73e7;hpb=0ac236dda6f80f6dc86a7f12d8c88b25e64e3251;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 32eccedd4..af543d640 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -40,9 +40,6 @@ CMOS =				\
 	matitaMisc.cmo		\
 	matitamakeLib.cmo	\
 	matitaInit.cmo		\
-	disambiguatePp.cmo	\
-	matitaSync.cmo		\
-	matitaDisambiguator.cmo	\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
@@ -60,9 +57,6 @@ CCMOS =				\
 	matitaMisc.cmo		\
 	matitamakeLib.cmo	\
 	matitaInit.cmo		\
-	disambiguatePp.cmo	\
-	matitaSync.cmo		\
-	matitaDisambiguator.cmo	\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
@@ -105,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)
 
@@ -203,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