X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2FMakefile;h=909a54843b5dd7fdaefe0e006331a580ddc9fc8e;hb=92f4f16a19c8d5edafad700a22e76eb2f22b4b31;hp=095395b5e355599e8afc7671ba23e50c2fc1ea76;hpb=698e9ce56864223fe73b1ebefaf19845daf0c3d7;p=oota-llvm.git

diff --git a/tools/Makefile b/tools/Makefile
index 095395b5e35..909a54843b5 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
 
-include $(LEVEL)/Makefile.common
+# Build clang if present.
+OPTIONAL_PARALLEL_DIRS := clang
 
-ifeq ($(ARCH),x86)
-# Only build jello when we are on X86
-all     :: jello/.makeall
-install :: jello/.makeinstall
-clean   :: jello/.makeclean
-endif
+# 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 llvmc
 
 
+include $(LEVEL)/Makefile.config
 
+ifeq ($(ENABLE_PIC),1)
+PARALLEL_DIRS += lto
+endif
+
+include $(LEVEL)/Makefile.common