Merge branch 'fp/make-j'

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

diff --combined Makefile
index ba214589cb35ae517c67ff2c1428efd81032e56e,c9a84aa25a6ebf7aaad133e6cafe4c2186e1db01..ac29c629e3927ad59142cf73d03eea501fc30962
--- 1/Makefile
--- 2/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