Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-07 13:20:47 +0400
committerJunio C Hamano <junkio@cox.net>2007-04-07 13:20:47 +0400
commit39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (patch)
treea571dd21ff570a22ed7386fc8070ab8eacf1af4a
parent5bba1b355ec505407dc7aef56dd0c94f60760f1a (diff)
parent3b486cd229f1db437462a45103ef01d50c47a00d (diff)
Merge branch 'fp/make-j'
* fp/make-j: Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ba214589cb..ac29c629e3 100644
--- a/Makefile
+++ b/Makefile
@@ -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