X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=d742f41bd65caf8dff27b692eec803e17dd39719;hb=963a97f1a365c8d09ca681e922371f9ec3473ee8;hp=10aff58ac66f336e9662a524b4f31f5a296a025f;hpb=4fcfc12daba974047f7c352c30d0d5c4f67e87a6;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 10aff58ac66..d742f41bd65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,14 +1,32 @@
+##===- tools/Makefile --------------------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
 LEVEL := ..
-PARALLEL_DIRS := as dis opt gccas llc link lli gccld analyze extract bugpoint
+# 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 \
+                 llc llvm-ranlib llvm-ar llvm-nm \
+                 llvm-ld llvm-prof llvm-link \
+		 lli gccas gccld llvm-extract llvm-db \
+		 bugpoint llvm-bcanalyzer llvm-stub llvmc2
 
-include $(LEVEL)/Makefile.common
 
-#ifeq ($(ARCH),x86)
-# Only build jello when we are on X86
-#all     :: jello/.makeall
-#install :: jello/.makeinstall
-#clean   :: jello/.makeclean
-#endif
+include $(LEVEL)/Makefile.config
 
+# Disable liblto as it is going away
+#PARALLEL_DIRS += lto
 
+# only build new lto project on Darwin for now
+ifeq ($(OS),Darwin)
+PARALLEL_DIRS += lto2
+endif
 
+include $(LEVEL)/Makefile.common