From 628d69ccb38327e50863bb4d572ece3e8e8d6343 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Mon, 4 Jul 2005 13:33:19 +0000 Subject: [PATCH] moo do not depend on .depend --- helm/matita/library/Makefile | 30 ++++++++++++++++-------------- helm/matita/tests/Makefile | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile index 74bc862bc..e76703a47 100644 --- a/helm/matita/library/Makefile +++ b/helm/matita/library/Makefile @@ -14,26 +14,28 @@ 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)rm -f $(SRC:%.ma=%.moo) + $(H)$(MATITACLEAN) $(SRC) cleanall: $(LINKS) - @rm -f $(SRC:%.ma=%.moo) + $(H)rm -f $(SRC:%.ma=%.moo) $(MATITACLEAN) all depend: @@ -41,22 +43,22 @@ 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) > $@ + $(H)$(MATITADEP) $(SRC) > $@ # Let's prepare the environment .matita: - @ln -fs ../.matita . + $(H)ln -fs ../.matita . matita.lang: - @ln -fs ../matita.lang . + $(H)ln -fs ../matita.lang . matita.conf.xml: - @ln -fs ../matita.conf.xml . + $(H)ln -fs ../matita.conf.xml . #done include $(DEPEND_NAME) diff --git a/helm/matita/tests/Makefile b/helm/matita/tests/Makefile index 47ed823a5..540a90a73 100644 --- a/helm/matita/tests/Makefile +++ b/helm/matita/tests/Makefile @@ -39,7 +39,7 @@ cleanall: $(LINKS) depend: $(DEPEND_NAME) .PHONY: depend -%.moo:%.ma $(DEPEND_NAME) $(LINKS) +%.moo:%.ma $(LINKS) @[ ! -e $@ ] || $(MATITACLEAN) $< @$(MATITAC) $< || $(MATITACLEAN) $< -- 2.39.2