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