@matheusbsbs / matheus-bagliano / commits / a6f37099d0
Fork 0

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>

Alex Riesen committed Mar 7, 2007 at 00:05 UTC a6f37099d0fce10b536abc1d1a8111460638bac0
1 file changed +8 -2
Makefile
+8 -2
@@ -608,6 +608,12 @@ endif
608 QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir
609 QUIET_SUBDIR1 =
610
611 +ifneq ($(findstring $(MAKEFLAGS),w),w)
612 +PRINT_DIR = --no-print-directory
613 +else # "make -w"
614 +NO_SUBDIR = :
615 +endif
616 +
617 ifneq ($(findstring $(MAKEFLAGS),s),s)
618 ifndef V
619 QUIET_CC = @echo ' ' CC $@;
@@ -616,8 +622,8 @@ ifndef V
622 QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
623 QUIET_GEN = @echo ' ' GEN $@;
624 QUIET_SUBDIR0 = @subdir=
619 - QUIET_SUBDIR1 = ;echo ' ' SUBDIR $$subdir; \
620 - $(MAKE) --no-print-directory -C $$subdir
625 + QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
626 + $(MAKE) $(PRINT_DIR) -C $$subdir
627 export V
628 export QUIET_GEN
629 export QUIET_BUILT_IN