From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Mon, 9 Jan 2006 13:53:21 +0000 (+0000)
Subject: - new location for coq.ma
X-Git-Tag: make_still_working~7874
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=0475d733a3fcafe2ed37fccda33b830e5284cda9;p=helm.git

- new location for coq.ma
- better implementation of test related Makefile rules
---

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 4e1d7b5b1..0614bda3d 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -99,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)
 
@@ -197,31 +197,28 @@ clean:
 		$(PROGRAMS_UPX) \
 		$(NULL)
 
-tests: matitac matitadep matitaclean coq.moo
-	@-(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
+	-cd $* && make -k clean.opt opt
+%-cleantests: matitaclean
+	-cd $* && make clean
+%-cleantests-opt: matitaclean.opt
+	-cd $* && make clean.opt
 
 # {{{ Distribution stuff