diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2007-03-07 00:05:34 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-06 17:17:13 -0800 |
| commit | a6f37099d0fce10b536abc1d1a8111460638bac0 (patch) | |
| tree | 8e1835c60feb25887acfb7f61bbc7f53209bf296 | |
| parent | b777434383bd2f365be6896d8c89be6c1b62a135 (diff) | |
| download | git-a6f37099d0fce10b536abc1d1a8111460638bac0.tar.gz | |
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>
| -rw-r--r-- | Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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 |