Rearrange the build order to better accommodate parallel build by reducing

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index eb70ce9989f3fc03d695ec133bed8975d57097b9..7a062e54f1eeabc45130ade4cfb88ec2e041f8a6 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,18 +8,9 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld llvm-stub \
-                 analyze llvm-extract llvm-nm llvm-prof llvm-ar llvm-ranlib \
-                 llvm-bcanalyzer llvmc llvm-ld llvm-db bugpoint
+PARALLEL_DIRS := llvm-config opt llvm-as -llvm-dis llc llvm-bcanalyzer \
+                 llvm-extract lli llvm-db llvm-ar llvm-ld llvm-prof llvm-nm \
+                 gccas llvm-ranlib llvm-stub gccld llvm2cpp \
+                 bugpoint llvmc llvm-link
 
-include $(LEVEL)/Makefile.config
-
-# The bugpoint and llvm-db tools are not portable to Win32 because they depend
-# on fork(2) behavior that Win32 doesn't have. At some point they'll be 
-# rewritten to not depend on fork at which time they should be added back to
-# the list above.
-ifneq ($(LLVM_ON_UNIX),1)
-PARALLEL_DIRS := $(filter-out bugpoint llvm-db,$(PARALLEL_DIRS))
-endif
-
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(LEVEL)/Makefile.common