version 0.7.1

[helm.git] / helm / matita / library / Makefile

diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index 74bc862bcbde730373a6d4c6130590da6b980302..7b456849aede0fd3c761f62e25476956d0ef8d65 100644 (file)
--- a/helm/matita/library/Makefile
+++ b/helm/matita/library/Makefile
@@ -1,4 +1,4 @@
-SRC=$(wildcard *.ma)
+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
@@ -12,28 +12,28 @@ 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)
-       @$(MATITACLEAN) $(SRC)
+       $(H)$(MATITACLEAN) $(SRC)
 
 cleanall: $(LINKS)
-       @rm -f $(SRC:%.ma=%.moo)
+       $(H)rm -f $(SRC:%.ma=%.moo)
        $(MATITACLEAN) all
 
 depend:
@@ -41,22 +41,11 @@ depend:
        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 -fs ../.matita .
-
-matita.lang:
-       @ln -fs ../matita.lang .
-
-matita.conf.xml:
-       @ln -fs ../matita.conf.xml .
-#done
+       $(H)$(MATITADEP) $(SRC) > $@
 
 include $(DEPEND_NAME)