X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=3d2c1f052e7dc9f10b318b46e4c126bf4f2a7642;hb=c9c448ffa2bb7fe1bac80a7bc014740bb7b403fd;hp=45b92ef558d605ae437f9f6e6962dd64440ad2ae;hpb=67e7104db7e07a6fbb9000f45864a5529e3f8559;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 45b92ef558d..3d2c1f052e7 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-##===- tools/Makefile ------------------------------*- Makefile -*-===##
+##===- tools/Makefile --------------------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -6,9 +6,24 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
+
 LEVEL := ..
-PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld \
-                 analyze extract bugpoint llvm-nm llvm-prof llvm-ar
+# NOTE: The tools are organized into five groups of four consisting of one 
+# large and three small executables. This is done to minimize memory load 
+# in parallel builds.  Please retain this ordering.
+PARALLEL_DIRS := llvm-config  \
+                 opt llvm-as llvm-dis llvm-upgrade \
+                 llc llvm-ranlib llvm-ar llvm-nm \
+                 llvm-ld llvmc llvm-prof llvm-link \
+		 lli gccas gccld llvm-extract llvm-db llvm2cpp \
+		 bugpoint llvm-stub llvm-bcanalyzer llvm-stub
+		
 
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.config
 
+# Disable liblto on Windows until compatability is determined.
+ifneq ($(OS), MingW)
+PARALLEL_DIRS += lto
+endif
+
+include $(LEVEL)/Makefile.common