Update testing documentation with more consistent terminology.

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index db586c2f115e0867365537619573e8552d1fec31..d742f41bd65caf8dff27b692eec803e17dd39719 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,8 +2,8 @@
 # 
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by the LLVM research group and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
@@ -11,19 +11,22 @@ LEVEL := ..
 # 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 \
+PARALLEL_DIRS := llvm-config  \
+                 opt llvm-as llvm-dis \
                  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 \
-               
+                 llvm-ld llvm-prof llvm-link \
+                lli gccas gccld llvm-extract llvm-db \
+                bugpoint llvm-bcanalyzer llvm-stub llvmc2
+
 
 include $(LEVEL)/Makefile.config
 
-# Disable liblto on Windows until compatability is determined.
-ifneq ($(OS), MingW)
-PARALLEL_DIRS += lto
+# 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