From a22a5b382f2e30d5b51be343aaf8a003b5d6c3b7 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Wed, 17 May 2006 22:55:35 +0000
Subject: [PATCH] Make some changes suggested by Chris: 1. Remove the
 LLVM_DO_NOT_BUILD feature (not needed any more) 2. Ensure that lib/VMCore
 gets built first. This needs to be done because    VMCore now uses tblgen to
 generate the Intrinsics header which are    needed in other libraries. In
 parallel builds, this can cause problems.

llvm-svn: 28374
---
 llvm/Makefile       |  2 +-
 llvm/Makefile.rules | 16 ++++------------
 llvm/lib/Makefile   |  4 ++--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/llvm/Makefile b/llvm/Makefile
index 1aa33039794a..72f6e934c9a1 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/System lib/Support utils lib
+DIRS = lib/System lib/Support utils lib/VMCore lib
 
 include $(LEVEL)/Makefile.config 
 
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index aa61380aaf05..b3b10e557fe2 100644
--- a/llvm/Makefile.rules
+++ b/llvm/Makefile.rules
@@ -472,9 +472,7 @@ $(RecursiveTargets)::
 	    $(MKDIR) $$dir; \
 	    $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
 	  fi; \
-	  if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-	    ($(MAKE) -C $$dir $@ ) || exit 1; \
-	  fi ; \
+	  ($(MAKE) -C $$dir $@ ) || exit 1; \
 	done
 endif
 
@@ -489,9 +487,7 @@ $(RecursiveTargets)::
 	    $(MKDIR) $$dir; \
 	    $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
 	  fi; \
-	  if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-	    ($(MAKE) -C $$dir $@ ) || exit 0; \
-	  fi ; \
+	  ($(MAKE) -C $$dir $@ ) || exit 0; \
 	done
 endif
 
@@ -517,9 +513,7 @@ $(ParallelTargets) :
 	  $(MKDIR) $(@D); \
 	  $(CP) $(PROJ_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \
 	fi; \
-	if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-	  $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ; \
-	fi
+	$(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ;
 endif
 
 #---------------------------------------------------------
@@ -537,9 +531,7 @@ $(RecursiveTargets)::
 	      $(MKDIR) $$dir; \
 	      $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
 	    fi; \
-	    if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-	      ($(MAKE) -C$$dir $@ ) || exit 1; \
-	    fi ; \
+	    ($(MAKE) -C$$dir $@ ) || exit 1; \
 	  fi \
 	done
 endif
diff --git a/llvm/lib/Makefile b/llvm/lib/Makefile
index f1eb8b333098..7a05dfd133a4 100644
--- a/llvm/lib/Makefile
+++ b/llvm/lib/Makefile
@@ -8,8 +8,8 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ..
 
-DIRS = VMCore Analysis Transforms AsmParser Bytecode CodeGen Target \
-       ExecutionEngine Debugger Linker
+PARALLEL_DIRS = VMCore Analysis Transforms AsmParser Bytecode CodeGen Target \
+                ExecutionEngine Debugger Linker 
 
 include $(LEVEL)/Makefile.common