From f889c8d9a623fe85258f065242ad6e95c9adfec9 Mon Sep 17 00:00:00 2001
From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Tue, 19 Jul 2005 11:33:32 +0000
Subject: [PATCH] Many bugs in the Makefile fixed. make inside library/tests
 now stops at the first error make tests{,.opt} goes on trying to compile
 everything (for the night benchmark)

---
 helm/matita/Makefile.in      |  8 ++++----
 helm/matita/library/Makefile | 12 ++++--------
 helm/matita/tests/Makefile   | 14 +++++---------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index da10c563a..7a553445d 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -160,11 +160,11 @@ distclean: clean
 	rm -f configure matita.conf.xml.sample
 
 tests: matitac matitadep matitaclean
-	@(cd library && make clean all)
-	@(cd tests && make clean all)
+	@(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)
 tests.opt: matitac.opt matitadep.opt matitaclean.opt
-	@(cd library && make clean.opt opt)
-	@(cd tests && make clean.opt 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)
 .PHONY: tests tests.opt
 
 tags: TAGS
diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index 820603831..392294579 100644
--- a/helm/matita/library/Makefile
+++ b/helm/matita/library/Makefile
@@ -20,11 +20,8 @@ all: $(SRC:%.ma=%.moo)
 opt:
 	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
 
-verbose.opt:
-	$(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
-
-verboseopt:
-	$(H)make MATITAC="$(VERBOSEMATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+verbose:
+	$(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEAN)" MATITADEP="$(MATITADEP)" all
 
 %.opt:
 	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" $(@:%.opt=%)
@@ -37,13 +34,12 @@ cleanall:
 	$(MATITACLEAN) all
 
 depend:
-	rm $(DEPEND_NAME)
+	rm -f $(DEPEND_NAME)
 	make $(DEPEND_NAME)
 .PHONY: depend
 
 %.moo:%.ma
-	$(H)[ ! -e $@ ] || $(MATITACLEAN) $< 
-	$(H)$(MATITAC) $< || $(MATITACLEAN) $<
+	$(H)$(MATITAC) $<
 
 $(DEPEND_NAME): $(SRC)
 	$(H)$(MATITADEP) $(SRC) > $@ || rm -f $@
diff --git a/helm/matita/tests/Makefile b/helm/matita/tests/Makefile
index 4c3b92d3d..2665c1a1a 100644
--- a/helm/matita/tests/Makefile
+++ b/helm/matita/tests/Makefile
@@ -20,11 +20,8 @@ all: $(SRC:%.ma=%.moo)
 opt:
 	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
 
-verbose.opt:
-	$(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
-
-verboseopt:
-	$(H)make MATITAC="$(VERBOSEMATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+verbose:
+	$(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEAN)" MATITADEP="$(MATITADEP)" all
 
 %.opt:
 	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" $(@:%.opt=%)
@@ -37,15 +34,14 @@ cleanall:
 	$(MATITACLEAN) all
 
 depend:
-	rm $(DEPEND_NAME)
+	rm -f $(DEPEND_NAME)
 	make $(DEPEND_NAME)
 .PHONY: depend
 
 %.moo:%.ma
-	$(H)[ ! -e $@ ] || $(MATITACLEAN) $< 
-	$(H)$(MATITAC) $< || $(MATITACLEAN) $<
+	$(H)$(MATITAC) $<
 
 $(DEPEND_NAME): $(SRC)
-	$(H)$(MATITADEP) $(SRC) > $@
+	$(H)$(MATITADEP) $(SRC) > $@ || rm -f $@
 
 include $(DEPEND_NAME)
-- 
2.39.2