From f1c35711595a3b699822ae598c9def00fd3de590 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 17 Sep 2002 23:35:02 +0000 Subject: [PATCH] Fix parallel recursive make to build directories in order llvm-svn: 3794 --- Makefile.common | 10 ++++------ Makefile.rules | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Makefile.common b/Makefile.common index cd21b40f422..da515716b0a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -179,12 +179,10 @@ ObjectsG = $(addprefix $(BUILD_ROOT)/Debug/,$(Objs)) ifdef DIRS # Only do this if we're using DIRS! -all :: $(addsuffix /.makeall , $(DIRS)) -install :: $(addsuffix /.makeinstall, $(DIRS)) -clean :: $(addsuffix /.makeclean , $(DIRS)) - -%/.makeall %/.makeclean %/.makeinstall: - $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@) +all install clean:: + @for dir in ${DIRS}; do \ + (cd $$dir; $(MAKE) $@) || exit 1; \ + done endif #--------------------------------------------------------- diff --git a/Makefile.rules b/Makefile.rules index cd21b40f422..da515716b0a 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -179,12 +179,10 @@ ObjectsG = $(addprefix $(BUILD_ROOT)/Debug/,$(Objs)) ifdef DIRS # Only do this if we're using DIRS! -all :: $(addsuffix /.makeall , $(DIRS)) -install :: $(addsuffix /.makeinstall, $(DIRS)) -clean :: $(addsuffix /.makeclean , $(DIRS)) - -%/.makeall %/.makeclean %/.makeinstall: - $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@) +all install clean:: + @for dir in ${DIRS}; do \ + (cd $$dir; $(MAKE) $@) || exit 1; \ + done endif #---------------------------------------------------------