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 eb6c421acc9fcd3ac69905b83647bfb32bea3711..983da608d6d56847d07959754c486cd3e6bb2f89 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -604,6 +604,11 @@ endif
 ifdef NO_PERL_MAKEMAKER
        export NO_PERL_MAKEMAKER
 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 $@;
 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
                         $(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);
 endif
 
 # Shell quote (do not use $(call) to accommodate ancient setups);