X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Flibrary%2FMakefile;h=8375a61b6877f256e1b91690f0e4d91ca5c505db;hb=5c6b8eec9db4119a87eb4fd4055f1ac31a713d90;hp=74bc862bcbde730373a6d4c6130590da6b980302;hpb=29a3bd5d160f31873236c93a008a9e4fd31c305e;p=helm.git

diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index 74bc862bc..8375a61b6 100644
--- a/helm/matita/library/Makefile
+++ b/helm/matita/library/Makefile
@@ -1,4 +1,4 @@
-SRC=$(wildcard *.ma)
+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
@@ -12,51 +12,37 @@ 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) $(SRC)
+clean:
+	$(H)$(MATITACLEAN) $(SRC)
 
-cleanall: $(LINKS)
-	@rm -f $(SRC:%.ma=%.moo)
+cleanall:
+	$(H)rm -f $(SRC:%.ma=%.moo)
 	$(MATITACLEAN) all
 
 depend:
-	rm $(DEPEND_NAME)
+	rm -f $(DEPEND_NAME)
 	make $(DEPEND_NAME)
 .PHONY: depend
 
-%.moo:%.ma $(DEPEND_NAME) $(LINKS)
-	@[ ! -e $@ ] || $(MATITACLEAN) $< 
-	@$(MATITAC) $< || $(MATITACLEAN) $<
-
-$(DEPEND_NAME): $(SRC) $(LINKS)
-	@$(MATITADEP) $(SRC) > $@
-
-# Let's prepare the environment
-.matita:
-	@ln -fs ../.matita .
-
-matita.lang:
-	@ln -fs ../matita.lang .
+%.moo:
+	$(H)$(MATITAC) $<
 
-matita.conf.xml:
-	@ln -fs ../matita.conf.xml .
-#done
+$(DEPEND_NAME): $(SRC)
+	$(H)$(MATITADEP) $(SRC) > $@ || rm -f $@
 
-include $(DEPEND_NAME)
+#include $(DEPEND_NAME)
+include .depend