Allow "make -w" generate its usual output

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 983da608d6d56847d07959754c486cd3e6bb2f89..bab75655635b17db80de05e04417c8e95fe70eb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -608,6 +608,12 @@ endif
 QUIET_SUBDIR0  = $(MAKE) -C # space to separate -C and subdir
 QUIET_SUBDIR1  =
 
 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 $@;
 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_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
        export V
        export QUIET_GEN
        export QUIET_BUILT_IN