Support of "make -s": do not output anything of the build itself
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen committed
Mar 7, 2007 at 00:44 UTC
b777434383bd2f365be6896d8c89be6c1b62a135
1 file changed
+7
-3
Makefile
+7
-3
@@ -604,6 +604,11 @@ endif
604
ifdef NO_PERL_MAKEMAKER
605
export NO_PERL_MAKEMAKER
606
endif
607
+
608
+QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir
609
+QUIET_SUBDIR1 =
610
+
611
+ifneq ($(findstring $(MAKEFLAGS),s),s)
612
ifndef V
613
QUIET_CC = @echo ' ' CC $@;
614
QUIET_AR = @echo ' ' AR $@;
@@ -615,9 +620,8 @@ ifndef V
620
$(MAKE) --no-print-directory -C $$subdir
621
export V
622
export QUIET_GEN
618
-else
619
- QUIET_SUBDIR0 = $(MAKE) -C
620
- QUIET_SUBDIR1 =
623
+ export QUIET_BUILT_IN
624
+endif
625
endif
626
627
# Shell quote (do not use $(call) to accommodate ancient setups);