[PATCH] Make the installation targets a little less chatty
From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:13
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
by default. V=1 works as usual. Signed-off-by: Alex Riesen <redacted> --- Now it quite quiet. I tried top show every installed file, but it wasn't an improvement at all so I decided to just show what's being done. Makefile | 32 +++++++++++++++++++------------- templates/Makefile | 5 +++-- 2 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index cac0a4a..fccc57b 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 $@;
@@ -973,33 +976,36 @@ check: common-cmds.h ### Installation rules 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)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)' + $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' + @echo installing programs + $(QUIET)$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(QUIET)$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' + @echo setting up builtins + $(QUIET)$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) + $(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)$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk + $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) install endif - if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ + @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.162.gbaa1f