From a6f37099d0fce10b536abc1d1a8111460638bac0 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Wed, 7 Mar 2007 00:05:34 +0100 Subject: [PATCH] Allow "make -w" generate its usual output Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 983da608d6..bab7565563 100644 --- a/Makefile +++ b/Makefile @@ -608,6 +608,12 @@ endif QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = +ifneq ($(findstring $(MAKEFLAGS),w),w) +PRINT_DIR = --no-print-directory +else # "make -w" +NO_SUBDIR = : +endif + ifneq ($(findstring $(MAKEFLAGS),s),s) ifndef V QUIET_CC = @echo ' ' CC $@; @@ -616,8 +622,8 @@ ifndef V QUIET_BUILT_IN = @echo ' ' BUILTIN $@; QUIET_GEN = @echo ' ' GEN $@; QUIET_SUBDIR0 = @subdir= - QUIET_SUBDIR1 = ;echo ' ' SUBDIR $$subdir; \ - $(MAKE) --no-print-directory -C $$subdir + QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ + $(MAKE) $(PRINT_DIR) -C $$subdir export V export QUIET_GEN export QUIET_BUILT_IN