diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:20:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:20:47 -0700 |
| commit | 39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (patch) | |
| tree | a571dd21ff570a22ed7386fc8070ab8eacf1af4a /Makefile | |
| parent | 5bba1b355ec505407dc7aef56dd0c94f60760f1a (diff) | |
| parent | 3b486cd229f1db437462a45103ef01d50c47a00d (diff) | |
| download | git-39415449ee9b0bfbd6026e38c6e5d43f99759bf2.tar.gz git-39415449ee9b0bfbd6026e38c6e5d43f99759bf2.tar.xz | |
Merge branch 'fp/make-j'
* fp/make-j:
Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -642,7 +642,7 @@ ifeq ($(TCLTK_PATH),) NO_TCLTK=NoThanks endif -QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir +QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = ifneq ($(findstring $(MAKEFLAGS),w),w) @@ -658,7 +658,7 @@ ifndef V QUIET_LINK = @echo ' ' LINK $@; QUIET_BUILT_IN = @echo ' ' BUILTIN $@; QUIET_GEN = @echo ' ' GEN $@; - QUIET_SUBDIR0 = @subdir= + QUIET_SUBDIR0 = +@subdir= QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ $(MAKE) $(PRINT_DIR) -C $$subdir export V |