X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Ftests%2FMakefile;h=79bbf3e396ca4512d7498c5bce0643716f5b7981;hb=49734f6f824dd310520cbb0cee0e605296e2d975;hp=7eee097ed2b608e85db1ed112674dd311d7e2e6f;hpb=ab4bfc365d14ebb2a8ee6bb17e7f1f5b66af646c;p=helm.git

diff --git a/helm/matita/tests/Makefile b/helm/matita/tests/Makefile
index 7eee097ed..79bbf3e39 100644
--- a/helm/matita/tests/Makefile
+++ b/helm/matita/tests/Makefile
@@ -1,11 +1,7 @@
-SRC= apply.ma auto.ma baseuri.ma coercions.ma comments.ma first.ma fguidi.ma\
-     fix_betareduction.ma fold.ma inversion.ma letrec.ma match_inference.ma\
-     mysql_escaping.ma record.ma replace.ma rewrite.ma second.ma simpl.ma\
-     test2.ma test3.ma test4.ma third.ma
+SRC=$(wildcard *.ma)
 
-
-MATITAC=../scripts/do_tests.sh ../matitac ../matitaclean /dev/null
-MATITACOPT=../scripts/do_tests.sh ../matitac.opt ../matitaclean.opt /dev/null
+MATITAC=../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null
+MATITACOPT=../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null
 VERBOSEMATITAC=../matitac
 VERBOSEMATITACOPT=../matitac.opt
 
@@ -16,44 +12,59 @@ MATITADEP=../matitadep
 MATITADEPOPT=../matitadep.opt
 
 DEPEND_NAME=.depend
-LINKS=.matita matita.lang matita.conf.xml
+LINKS=.matita matita.lang matita.conf.xml icons matita.ma.templ
+
+H=@
 
 all: $(LINKS) $(SRC:%.ma=%.moo)
 
 opt:
-	@make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
 
 verbose.opt:
-	@make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+	$(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
 
 verboseopt:
-	@make MATITAC="$(VERBOSEMATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+	$(H)make MATITAC="$(VERBOSEMATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
 
 %.opt:
-	@make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" $(@:%.opt=%)
+	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" $(@:%.opt=%)
 
 clean: $(LINKS)
-	rm -f $(SRC:%.ma=%.moo)
+	$(H)rm -f $(SRC:%.ma=%.moo)
+	$(H)$(MATITACLEAN) $(SRC)
+
+cleanall: $(LINKS)
+	$(H)rm -f $(SRC:%.ma=%.moo)
 	$(MATITACLEAN) all
 
-depend: $(DEPEND_NAME)
+depend:
+	rm $(DEPEND_NAME)
+	make $(DEPEND_NAME)
+.PHONY: depend
 
-%.moo:%.ma $(DEPEND_NAME) $(LINKS)
-	@[ ! -e $@ ] || $(MATITACLEAN) $< 
-	@$(MATITAC) $< || $(MATITACLEAN) $<
+%.moo:%.ma $(LINKS)
+	$(H)[ ! -e $@ ] || $(MATITACLEAN) $< 
+	$(H)$(MATITAC) $< || $(MATITACLEAN) $<
 
 $(DEPEND_NAME): $(SRC) $(LINKS)
-	$(MATITADEP) $(SRC) > $@
+	$(H)$(MATITADEP) $(SRC) > $@
 
 # Let's prepare the environment
 .matita:
-	ln -s ../.matita .
+	$(H)ln -fs ../.matita .
 
 matita.lang:
-	ln -s ../matita.lang .
+	$(H)ln -fs ../matita.lang .
 
 matita.conf.xml:
-	ln -s ../matita.conf.xml .
+	$(H)ln -fs ../matita.conf.xml .
+
+icons:
+	$(H)ln -fs ../icons .
+
+matita.ma.templ:
+	$(H)ln -fs ../matita.ma.templ .
 #done
 
 include $(DEPEND_NAME)