summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Alex Riesen <raa.lkml@gmail.com>2007-03-07 00:44:49 +0100
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-06 17:17:07 -0800
commitb777434383bd2f365be6896d8c89be6c1b62a135 (patch)
tree620c63c154fc295b2364387634d6cb15d072795e /Makefile
parentMore build output cleaning up (diff)
downloadtgif-b777434383bd2f365be6896d8c89be6c1b62a135.tar.xz
Support of "make -s": do not output anything of the build itself
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index eb6c421acc..983da608d6 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);