From: Junio C Hamano <junkio@cox.net>
Date: Sat, 7 Apr 2007 09:20:47 +0000 (-0700)
Subject: Merge branch 'fp/make-j'
X-Git-Tag: v1.5.2-rc0~76
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/39415449ee9b0bfbd6026e38c6e5d43f99759bf2?hp=-c

Merge branch 'fp/make-j'

* fp/make-j:
Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
---

39415449ee9b0bfbd6026e38c6e5d43f99759bf2
diff --combined Makefile
index ba214589cb,c9a84aa25a..ac29c629e3
--- a/Makefile
+++ b/Makefile
@@@ -385,7 -385,6 +385,7 @@@ endi
  ifeq ($(uname_S),Darwin)
  	NEEDS_SSL_WITH_CRYPTO = YesPlease
  	NEEDS_LIBICONV = YesPlease
 +	OLD_ICONV = UnfortunatelyYes
  	NO_STRLCPY = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@@ -642,7 -641,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 -657,7 +658,7 @@@ ifndef 
  	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
@@@ -728,7 -727,7 +728,7 @@@ help.o: common-cmds.
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)rm -f $@ && ln git$X $@
  
 -common-cmds.h: Documentation/git-*.txt
 +common-cmds.h: $(wildcard Documentation/git-*.txt)
  	$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
  
  $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh