X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Flibrary%2FMakefile;h=7b456849aede0fd3c761f62e25476956d0ef8d65;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=69e33b3c768e130a34531d019f6be730b999ae20;hpb=45a26f2d04bc86b596748187091668bbdb5f810d;p=helm.git

diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index 69e33b3c7..7b456849a 100644
--- a/helm/matita/library/Makefile
+++ b/helm/matita/library/Makefile
@@ -1,13 +1,7 @@
-SRC=\
-	bool.ma\
-	compare.ma\
-	equality.ma\
-	logic.ma\
-	nat.ma \
-        Z.ma
-
-MATITAC=../scripts/do_tests.sh ../matitac ../matitaclean /dev/null
-MATITACOPT=../scripts/do_tests.sh ../matitac.opt ../matitaclean.opt /dev/null
+SRC=$(shell find . -name "*.ma")
+
+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
 
@@ -18,44 +12,40 @@ MATITADEP=../matitadep
 MATITADEPOPT=../matitadep.opt
 
 DEPEND_NAME=.depend
-LINKS=.matita matita.lang matita.conf.xml
+
+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)$(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) > $@
-
-# Let's prepare the environment
-.matita:
-	ln -s ../.matita .
-
-matita.lang:
-	ln -s ../matita.lang .
-
-matita.conf.xml:
-	ln -s ../matita.conf.xml .
-#done
+	$(H)$(MATITADEP) $(SRC) > $@
 
 include $(DEPEND_NAME)