Skip to content

Commit

Permalink
Support of "make -s": do not output anything of the build itself
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Alex Riesen authored and Junio C Hamano committed Mar 7, 2007
1 parent 31d0399 commit b777434
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@;
Expand All @@ -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);
Expand Down

0 comments on commit b777434

Please sign in to comment.