X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=3d59960c0e68c37c58f0d8e8a9707078e289859c;hb=71590f4a0cb620a5e98fee3e8d65670271234532;hp=c0b49433e0b326d825c70b921c4cffcdd7974c68;hpb=b11d278a26840884692cdfb89e168081134d293f;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index c0b49433e..3d59960c0 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -33,6 +33,7 @@ CMOS =				\
 	matitaDisambiguator.cmo	\
 	matitaEngine.cmo	\
 	matitacLib.cmo \
+	matitamakeLib.cmo \
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
 	matitaGtkMisc.cmo	\
@@ -48,8 +49,8 @@ CCMOS =				\
 	matitaDb.cmo		\
 	matitaSync.cmo		\
 	matitaDisambiguator.cmo	\
-	matitaEngine.cmo	\
 	matitacleanLib.cmo	\
+	matitaEngine.cmo	\
 	matitacLib.cmo
 CLEANCMOS = $(CCMOS)
 MAKECMOS = $(CCMOS) matitamakeLib.cmo
@@ -58,13 +59,17 @@ MAKECMOS = $(CCMOS) matitamakeLib.cmo
 all: matita.conf.xml matita matitac matitatop cicbrowser matitadep matitaclean matitamake
 
 matita.conf.xml: matita.conf.xml.sample
-	@echo
-	@echo "matita.conf.xml.sample is newer than matita.conf.xml"
-	@echo
-	@echo "PLEASE update your configuration file!"
-	@echo "(copying matita.conf.xml.sample should work)"
-	@echo
-	@false
+	@if diff matita.conf.xml.sample matita.conf.xml 1>/dev/null 2>/dev/null; then\
+		touch matita.conf.xml;\
+	else\
+		echo;\
+		echo "matita.conf.xml.sample is newer than matita.conf.xml";\
+		echo;\
+		echo "PLEASE update your configuration file!";\
+		echo "(copying matita.conf.xml.sample should work)";\
+		echo;\
+		false;\
+	fi
 
 matita.conf.xml.sample: matita.conf.xml.sample.in
 	autoconf
@@ -155,12 +160,15 @@ 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)
-.PHONY: tests tests.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)
+cleantests: matitaclean
+	@(cd library && make clean)
+	@(cd tests && make clean)
+.PHONY: tests tests.opt cleantests
 
 tags: TAGS
 .PHONY: TAGS