From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 6 Mar 2007 23:44:49 +0000 (+0100)
Subject: Support of "make -s": do not output anything of the build itself
X-Git-Tag: v1.5.1-rc1~66^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b777434383bd2f365be6896d8c89be6c1b62a135;p=git.git

Support of "make -s": do not output anything of the build itself

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index eb6c421ac..983da608d 100644
--- a/Makefile
+++ b/Makefile
@@ -604,6 +604,11 @@ endif
 ifdef NO_PERL_MAKEMAKER
 	export NO_PERL_MAKEMAKER
 endif
+
+QUIET_SUBDIR0  = $(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1  =
+
+ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
 	QUIET_CC       = @echo '   ' CC $@;
 	QUIET_AR       = @echo '   ' AR $@;
@@ -615,9 +620,8 @@ ifndef V
 			 $(MAKE) --no-print-directory -C $$subdir
 	export V
 	export QUIET_GEN
-else
-	QUIET_SUBDIR0  = $(MAKE) -C
-	QUIET_SUBDIR1  =
+	export QUIET_BUILT_IN
+endif
 endif
 
 # Shell quote (do not use $(call) to accommodate ancient setups);