X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Flibrary%2FMakefile;h=5faa6f0f4e8ea8d1d344a0ca4a84314e99d3255d;hb=b84c60ff48a21a62a08e636f32cf0df46dfbe45a;hp=ed81e3eca185e98367d475811edf5167e6ebd141;hpb=822aaaeb5bb49fb6547242e28a6f19f22bf5f105;p=helm.git

diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index ed81e3eca..5faa6f0f4 100644
--- a/helm/matita/library/Makefile
+++ b/helm/matita/library/Makefile
@@ -1,52 +1,67 @@
-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
 
+MATITACLEAN=../matitaclean
+MATITACLEANOPT=../matitaclean.opt
+
+MATITADEP=../matitadep
+MATITADEPOPT=../matitadep.opt
+
 DEPEND_NAME=.depend
-LINKS=.matita matita.lang matita.conf.xml
+LINKS=.matita matita.lang matita.conf.xml icons
+
+H=@
 
 all: $(LINKS) $(SRC:%.ma=%.moo)
 
 opt:
-	make MATITAC=$(MATITACOPT) all
+	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
 
 verbose.opt:
-	make MATITAC=$(VERBOSEMATITAC) all
+	$(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
 
 verboseopt:
-	make MATITAC=$(VERBOSEMATITACOPT) all
+	$(H)make MATITAC="$(VERBOSEMATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+
+%.opt:
+	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" $(@:%.opt=%)
 
 clean: $(LINKS)
-	rm -f $(SRC:%.ma=%.moo)
-	../matitaclean all
+	$(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 $(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 .
 #done
 
 include $(DEPEND_NAME)