X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Flibrary%2FMakefile;h=4e85bccccfaaa81c2fdf18307d67223bc7951e51;hb=e6b28085c97ae7b9bd3f3262b105f6b84f42b047;hp=69e33b3c768e130a34531d019f6be730b999ae20;hpb=45a26f2d04bc86b596748187091668bbdb5f810d;p=helm.git

diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index 69e33b3c7..4e85bcccc 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" -a -type f)
+
+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,36 @@ MATITADEP=../matitadep
 MATITADEPOPT=../matitadep.opt
 
 DEPEND_NAME=.depend
-LINKS=.matita matita.lang matita.conf.xml
 
-all: $(LINKS) $(SRC:%.ma=%.moo)
+H=@
 
-opt:
-	@make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+all: $(SRC:%.ma=%.mo)
 
-verbose.opt:
-	@make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+opt:
+	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
 
-verboseopt:
-	@make MATITAC="$(VERBOSEMATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+verbose:
+	$(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEAN)" MATITADEP="$(MATITADEP)" 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)
-	$(MATITACLEAN) all
+clean:
+	$(H)$(MATITACLEAN) $(SRC)
 
-depend: $(DEPEND_NAME)
-
-%.moo:%.ma $(DEPEND_NAME) $(LINKS)
-	@[ ! -e $@ ] || $(MATITACLEAN) $< 
-	@$(MATITAC) $< || $(MATITACLEAN) $<
-
-$(DEPEND_NAME): $(SRC) $(LINKS)
-	$(MATITADEP) $(SRC) > $@
+cleanall:
+	$(H)rm -f $(SRC:%.ma=%.moo)
+	$(MATITACLEAN) all
 
-# Let's prepare the environment
-.matita:
-	ln -s ../.matita .
+depend:
+	rm -f $(DEPEND_NAME)
+	make $(DEPEND_NAME)
+.PHONY: depend
 
-matita.lang:
-	ln -s ../matita.lang .
+%.moo:
+	$(H)$(MATITAC) $<
 
-matita.conf.xml:
-	ln -s ../matita.conf.xml .
-#done
+$(DEPEND_NAME): $(SRC)
+	$(H)$(MATITADEP) $(SRC) > $@ || rm -f $@
 
 include $(DEPEND_NAME)