Skip to content

Commit

Permalink
Merge branch 'fp/make-j'
Browse files Browse the repository at this point in the history
* fp/make-j:
  Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
  • Loading branch information
Junio C Hamano committed Apr 7, 2007
2 parents 5bba1b3 + 3b486cd commit 3941544
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 3941544

Please sign in to comment.