by default. V=1 works as usual. Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx> --- Updated. BTW, where does "no $(call) in Makefile" came from? It could simplify the thing a lot Makefile | 44 +++++++++++++++++++++++++++++++++----------- templates/Makefile | 5 +++-- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index cac0a4a..6409b9c 100644 --- a/Makefile +++ b/Makefile @@ -660,6 +660,7 @@ ifeq ($(TCLTK_PATH),) NO_TCLTK=NoThanks endif +QUIET= QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = @@ -671,6 +672,8 @@ endif ifneq ($(findstring $(MAKEFLAGS),s),s) ifndef V + QUIET = @ + QUIET_CC = @echo ' ' CC $@; QUIET_AR = @echo ' ' AR $@; QUIET_LINK = @echo ' ' LINK $@; @@ -972,34 +975,53 @@ check: common-cmds.h ### Installation rules +ifeq ($(QUIET),@) +INST_0 = arg= +INST_1 = &&echo " INSTALL $$arg"&&$(INSTALL) "$$arg" # space +BSETUP_0 = arg= +BSETUP_1 = &&echo " SETUP BUILTIN $$arg"&& \ + rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/'"$$arg" && \ + ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$(X)' \ + '$(DESTDIR_SQ)$(gitexecdir_SQ)/'"$$arg" # space +else +INST_0 = $(INSTALL) # space to separate "install" and its first arg +INST_1 = +BSETUP_0 = arg= +BSETUP_1 = &&rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/'"$$arg" && \ + ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$(X)' \ + '$(DESTDIR_SQ)$(gitexecdir_SQ)/'"$$arg" # space +endif + install: all $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' - $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' - $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' - $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install - $(MAKE) -C perl prefix='$(prefix_SQ)' install + $(QUIET)$(foreach p,$(ALL_PROGRAMS),\ + $(INST_0)'$p' $(INST_1)'$(DESTDIR_SQ)$(gitexecdir_SQ)' &&): + $(QUIET)$(INST_0)git$X $(INST_1)'$(DESTDIR_SQ)$(bindir_SQ)' + $(QUIET)$(foreach p,$(BUILT_INS),$(BSETUP_0)$p $(BSETUP_1)&&): + $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) DESTDIR='$(DESTDIR_SQ)' install + $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) prefix='$(prefix_SQ)' install ifndef NO_TCLTK - $(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk - $(MAKE) -C git-gui install + $(QUIET)$(INST_0)gitk-wish $(INST_1)'$(DESTDIR_SQ)$(bindir_SQ)'/gitk + $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) install endif - if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ + $(QUIET)if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ then \ ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \ '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' || \ cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \ '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \ fi - $(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) ifneq (,$X) - $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';) + @echo cleaning '$(DESTDIR_SQ)$(gitexecdir_SQ)' of old scripts + $(QUIET)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';) endif install-doc: - $(MAKE) -C Documentation install + $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) install quick-install-doc: - $(MAKE) -C Documentation quick-install + $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) quick-install diff --git a/templates/Makefile b/templates/Makefile index b8352e7..b9a39e2 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -45,6 +45,7 @@ clean: rm -rf blt boilerplates.made install: all - $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)' - (cd blt && $(TAR) cf - .) | \ + @echo installing templates + $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)' + $(QUIET)(cd blt && $(TAR) cf - .) | \ (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -) -- 1.5.2.182.ged6b - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
