Use archive libraries instead of object files for VMCore, BCReader,

BCWriter, and bzip2 libraries. Adjust the various makefiles to accommodate
these changes. This was done to speed up link times.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28610 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index b719e8c130360aecc23056b94a201d081ccc1b66..acef6608130dd8e33d929929797a01ffd131c664 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -357,7 +357,7 @@ endif
 # Options To Invoke Tools
 #----------------------------------------------------------
 
-CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
+CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused 
 
 ifeq ($(OS),HP-UX)
   CompileCommonOpts := -D_REENTRANT -D_HPUX_SOURCE
@@ -628,7 +628,7 @@ ifdef ENABLE_ALPHA_JIT
 endif
 
 LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \
-            LLVMBCReader LLVMTarget.a LLVMCore LLVMSupport.a LLVMbzip2 \
+            LLVMBCReader.a LLVMTarget.a LLVMCore.a LLVMSupport.a LLVMbzip2.a \
             LLVMSystem.a $(PLATFORMLIBDL)
 endif
 

diff --git a/examples/ModuleMaker/Makefile b/examples/ModuleMaker/Makefile
index a9e40742ceebf8230615771c916e9c7c34ed154f..e24e0df49d734a5397789b3936668d771130c376 100644 (file)
--- a/examples/ModuleMaker/Makefile
+++ b/examples/ModuleMaker/Makefile
@@ -9,6 +9,6 @@
 LEVEL=../..
 TOOLNAME=ModuleMaker
 EXAMPLE_TOOL = 1
-USEDLIBS= LLVMBCWriter LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS= LLVMBCWriter.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/AsmParser/Makefile b/lib/AsmParser/Makefile
index f10aaba4582b5d5e984453d8eccf9945b1f4a77c..01bbc81045963595b4bd594c0b45148ea8e7cc10 100644 (file)
--- a/lib/AsmParser/Makefile
+++ b/lib/AsmParser/Makefile
@@ -9,6 +9,7 @@
 
 LEVEL = ../..
 LIBRARYNAME := LLVMAsmParser
+BUILD_ARCHIVE = 1
 EXTRA_DIST := Lexer.cpp.cvs Lexer.l.cvs \
               llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs
 

diff --git a/lib/Bytecode/Reader/Makefile b/lib/Bytecode/Reader/Makefile
index cdfa11b1f1f7e018818027f006f31534a8456c26..a86d008715f37fbacf0d90fca4ef9a2e3c45f9ba 100644 (file)
--- a/lib/Bytecode/Reader/Makefile
+++ b/lib/Bytecode/Reader/Makefile
@@ -8,6 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 LIBRARYNAME = LLVMBCReader
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Bytecode/Writer/Makefile b/lib/Bytecode/Writer/Makefile
index e1bf0da87db212df8a62990849c63ce69f3b0262..e731bb14a9fc9d389c25bb02c82115c918a5a1b8 100644 (file)
--- a/lib/Bytecode/Writer/Makefile
+++ b/lib/Bytecode/Writer/Makefile
@@ -8,5 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 LIBRARYNAME = LLVMBCWriter
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/CodeGen/Makefile b/lib/CodeGen/Makefile
index 05453a36ef7d025c450fd9fa6ab0779b553140c9..744f8e937b9bc5f0d02e244542bfc66b98640381 100644 (file)
--- a/lib/CodeGen/Makefile
+++ b/lib/CodeGen/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-PARALLEL_DIRS = SelectionDAG
 LIBRARYNAME = LLVMCodeGen
+PARALLEL_DIRS = SelectionDAG
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/CodeGen/SelectionDAG/Makefile b/lib/CodeGen/SelectionDAG/Makefile
index 85aafab0b84f2502e2e887e50376555cc01520ed..73d9edb9908f56a1da6d1e511696ebdc907a9c49 100644 (file)
--- a/lib/CodeGen/SelectionDAG/Makefile
+++ b/lib/CodeGen/SelectionDAG/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-PARALLEL_DIRS =
 LIBRARYNAME = LLVMSelectionDAG
+PARALLEL_DIRS =
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Support/bzip2/Makefile b/lib/Support/bzip2/Makefile
index 6294a4b13a7c60ced832ee439c6d47bd6817e7d3..fc16c4def43c1d2f1eeeb25c2b18574974a9e5c4 100644 (file)
--- a/lib/Support/bzip2/Makefile
+++ b/lib/Support/bzip2/Makefile
@@ -8,6 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 LIBRARYNAME = LLVMbzip2
+BUILD_ARCHIVE = 1
 SOURCES = blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c \
          bzlib.c
 EXTRA_DIST = bzlib.h bzlib_private.h CHANGES LICENSE README \

diff --git a/lib/Target/CBackend/Makefile b/lib/Target/CBackend/Makefile
index fc32db0a40ed270f293baf0ed3fcad335a009062..ac6ff3bb530cfd4dc1ebd2c2c1cee9887c056b70 100644 (file)
--- a/lib/Target/CBackend/Makefile
+++ b/lib/Target/CBackend/Makefile
@@ -9,5 +9,5 @@
 
 LEVEL = ../../..
 LIBRARYNAME = LLVMCBackend
+CXXFLAGS += -pedantic -Wno-long-long
 include $(LEVEL)/Makefile.common
-

diff --git a/lib/VMCore/Makefile b/lib/VMCore/Makefile
index c961020372eb9d30740d638eda979bdaa7b7dcb6..6c2137eaddb0acea78b09ee2112eb9a9ecd9d90b 100644 (file)
--- a/lib/VMCore/Makefile
+++ b/lib/VMCore/Makefile
@@ -8,14 +8,10 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 LIBRARYNAME = LLVMCore
+BUILD_ARCHIVE = 1
 
 BUILT_SOURCES = $(PROJ_SRC_ROOT)/include/llvm/Intrinsics.gen
 
-include $(LEVEL)/Makefile.config
-ifeq ($(ARCH),Alpha)
-BUILD_ARCHIVE = 1
-endif
-
 include $(LEVEL)/Makefile.common
 
 GENFILE:=$(PROJ_SRC_ROOT)/include/llvm/Intrinsics.gen

diff --git a/projects/Stacker/tools/stkrc/Makefile b/projects/Stacker/tools/stkrc/Makefile
index 8814b92ef06dcb0ea3da07dcee49d6c0468fe6c7..cfe553b857f21dbfc8bc95c45ee7d6538eb7be7a 100644 (file)
--- a/projects/Stacker/tools/stkrc/Makefile
+++ b/projects/Stacker/tools/stkrc/Makefile
@@ -9,9 +9,9 @@ LEVEL=../..
 # Give the name of a library.  This will build a dynamic version.
 #
 TOOLNAME = stkrc
-LLVMLIBS = LLVMAsmParser LLVMBCWriter LLVMipo.a \
-          LLVMScalarOpts.a LLVMTransforms.a LLVMTransformUtils.a LLVMipa.a LLVMAnalysis.a LLVMTarget.a \
-          LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a 
+LLVMLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMipo.a LLVMScalarOpts.a \
+         LLVMTransforms.a LLVMTransformUtils.a LLVMipa.a LLVMAnalysis.a \
+         LLVMTarget.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a 
 CONFIG_FILES = st
 EXTRA_DIST = st
 USEDLIBS=stkr_compiler 

diff --git a/runtime/GC/SemiSpace/Makefile b/runtime/GC/SemiSpace/Makefile
index 8aaa29c8cb00b4dc6820c1502ff00b22c77a81f6..6f8e54ce2765e99769f625169956be539471664f 100644 (file)
--- a/runtime/GC/SemiSpace/Makefile
+++ b/runtime/GC/SemiSpace/Makefile
@@ -15,3 +15,5 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/../gc_exported_symbols.lst
 
 include $(LEVEL)/Makefile.common
 
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))

diff --git a/runtime/GCCLibraries/libc/Makefile b/runtime/GCCLibraries/libc/Makefile
index c2106e01fd49326045bfb609e2f0cde0e601be1a..4dc2f88a92e38dc357866f3d6b27b186ef06ca90 100644 (file)
--- a/runtime/GCCLibraries/libc/Makefile
+++ b/runtime/GCCLibraries/libc/Makefile
@@ -1,4 +1,4 @@
-##===- runtime/GCCLibraries/libc/Makefile ------------------------------*- Makefile -*-===##
+##===- runtime/GCCLibraries/libc/Makefile ------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -15,3 +15,5 @@ BYTECODE_DESTINATION = $(CFERuntimeLibDir)
 
 include $(LEVEL)/Makefile.common
 
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))

diff --git a/runtime/libtrace/Makefile b/runtime/libtrace/Makefile
index b39ca6b10ca2ed415da6efb836ae0a79541ecbdd..9a070703746dd63e619ff75ab0fab1865243f49d 100644 (file)
--- a/runtime/libtrace/Makefile
+++ b/runtime/libtrace/Makefile
@@ -14,3 +14,5 @@ BYTECODE_DESTINATION = $(CFERuntimeLibDir)
 
 include $(LEVEL)/Makefile.common
 
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))

diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index 06def88d01a0982f55fb94b99161ae50a77f8234..0f0eb72628ece04be886f1b5a1d4a25724d562b4 100644 (file)
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -8,9 +8,9 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = analyze
-USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis.a LLVMipa.a \
+USEDLIBS = LLVMAsmParser.a LLVMBCReader.a LLVMAnalysis.a LLVMipa.a \
            LLVMDataStructure \
           LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \
-          LLVMTransformUtils.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+          LLVMTransformUtils.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile
index 6460aa82aa2a44dc32f365b0f0a1f75d94244dff..338122ac148667179e5abacc8de974a86a2657be 100644 (file)
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@@ -15,7 +15,7 @@ ANALIBS  = LLVMDataStructure LLVMipa.a LLVMTarget.a
 
 USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
           LLVMTransformUtils.a \
-          LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \
-          LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+          LLVMAsmParser.a LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
+          LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile
index 32c10c88658d2408d257d8e54e19166b36814976..55b0379941a7a8ee6f00574439c0141d2688ef2d 100644 (file)
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@@ -9,8 +9,8 @@
 LEVEL = ../..
 
 TOOLNAME = gccas
-USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
+USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a LLVMipa.a \
            LLVMScalarOpts.a LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils.a \
-           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/gccld/Makefile b/tools/gccld/Makefile
index 96e73d6871363364e2ef5878509899d7be8ff6dc..44c6be9834b0b568d3ffd154f493963c1c805a00 100644 (file)
--- a/tools/gccld/Makefile
+++ b/tools/gccld/Makefile
@@ -12,7 +12,7 @@ LEVEL = ../..
 TOOLNAME = gccld
 USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
            LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
-           LLVMArchive.a LLVMBCReader LLVMBCWriter \
-           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+           LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
+           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index ed48accf2beadc0bfb0003de7e931eb6194a574e..fe744039636ded64f010dc6593bc470efac14c43 100644 (file)
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -56,17 +56,17 @@ endif
 USEDLIBS += \
        LLVMSelectionDAG \
        LLVMCodeGen \
-       LLVMTarget.a \
+       LLVMTarget \
        LLVMipa.a \
        LLVMTransforms.a \
        LLVMScalarOpts.a \
        LLVMTransformUtils.a \
        LLVMAnalysis.a \
-       LLVMBCReader \
-       LLVMBCWriter \
-       LLVMCore \
+       LLVMBCReader.a \
+       LLVMBCWriter.a \
+       LLVMCore.a \
        LLVMSupport.a \
-       LLVMbzip2 \
+       LLVMbzip2.a \
        LLVMSystem.a
 
 include $(LLVM_SRC_ROOT)/Makefile.rules

diff --git a/tools/llvm-ar/Makefile b/tools/llvm-ar/Makefile
index 3375f9ee3650608317d164e5c1cdaca3a2067892..fbc2bcf35307e397e3a84e182d1b5e08b2455cf5 100644 (file)
--- a/tools/llvm-ar/Makefile
+++ b/tools/llvm-ar/Makefile
@@ -9,8 +9,8 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-ar
-USEDLIBS = LLVMArchive.a LLVMBCReader \
-          LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMArchive.a LLVMBCReader.a \
+          LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common
 

diff --git a/tools/llvm-as/Makefile b/tools/llvm-as/Makefile
index 91de6d2490bbe0ead3622518d07bf203891ed130..73dcb06aff46493d5229f25906f33fbfde70def2 100644 (file)
--- a/tools/llvm-as/Makefile
+++ b/tools/llvm-as/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvm-as
-USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMCore \
-           LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \
+           LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-bcanalyzer/Makefile b/tools/llvm-bcanalyzer/Makefile
index 3793cfbfd65cd3b1fb50960a304f52aa1e93b2ae..791464631421ec46cdd224158488c8269da96246 100644 (file)
--- a/tools/llvm-bcanalyzer/Makefile
+++ b/tools/llvm-bcanalyzer/Makefile
@@ -9,5 +9,5 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-bcanalyzer
-USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-db/Makefile b/tools/llvm-db/Makefile
index e5b0d2916b60a68d7b88166e50c6d2b90efa6967..31ebbba59cd349b067f888013985eddeb055a46e 100644 (file)
--- a/tools/llvm-db/Makefile
+++ b/tools/llvm-db/Makefile
@@ -9,6 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-db
-USEDLIBS = LLVMDebugger LLVMBCReader LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMDebugger LLVMBCReader.a LLVMCore.a LLVMSupport.a \
+         LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-dis/Makefile b/tools/llvm-dis/Makefile
index ebf21c461f3342c27e43014c87121ccea563e32f..8e54fb347c865676c567705caf576e83d67469b6 100644 (file)
--- a/tools/llvm-dis/Makefile
+++ b/tools/llvm-dis/Makefile
@@ -9,5 +9,5 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-dis
-USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-extract/Makefile b/tools/llvm-extract/Makefile
index 80a90fa41a887eb60b1bd0cb5d8946a7b9480100..73d5883403a8f05efcad72fbe76d92c5db8cc0a2 100644 (file)
--- a/tools/llvm-extract/Makefile
+++ b/tools/llvm-extract/Makefile
@@ -9,8 +9,8 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-extract
-USEDLIBS = LLVMBCReader LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMTarget.a \
-           LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
-           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a \
+          LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
+           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-ld/Makefile b/tools/llvm-ld/Makefile
index 34d6dc69ca4690e9a8a8fe84ec1c09a30963fd6d..eb2158a252a1d5516f11d2a1a6f0d618857aaa9d 100644 (file)
--- a/tools/llvm-ld/Makefile
+++ b/tools/llvm-ld/Makefile
@@ -12,7 +12,7 @@ LEVEL = ../..
 TOOLNAME = llvm-ld
 USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
           LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
-          LLVMArchive.a LLVMBCReader LLVMBCWriter \
-          LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+          LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
+          LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-link/Makefile b/tools/llvm-link/Makefile
index 9c3fa53113d49e6d6fd810e7a7046e251faae3f2..41594f2c51e9345788fbcd858386a229a94c21ee 100644 (file)
--- a/tools/llvm-link/Makefile
+++ b/tools/llvm-link/Makefile
@@ -9,7 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-link
-USEDLIBS = LLVMLinker.a LLVMBCReader LLVMBCWriter \
-          LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
+          LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-nm/Makefile b/tools/llvm-nm/Makefile
index 9868b2ab9ae0080aaacf5238f83c565b91dee0f7..996b3494de9cce541b24286da18df3fcae99c507 100644 (file)
--- a/tools/llvm-nm/Makefile
+++ b/tools/llvm-nm/Makefile
@@ -9,6 +9,6 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-nm
-USEDLIBS = LLVMArchive.a LLVMBCReader \
-          LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMArchive.a LLVMBCReader.a \
+          LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-prof/Makefile b/tools/llvm-prof/Makefile
index b0d4b3e5796f1672100db0cc0558fcaa5f178ef7..029297a5711265e97dc901a58c6ed710c97baa5f 100644 (file)
--- a/tools/llvm-prof/Makefile
+++ b/tools/llvm-prof/Makefile
@@ -9,7 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-prof
-USEDLIBS = LLVMAnalysis.a LLVMBCReader \
-           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMAnalysis.a LLVMBCReader.a \
+           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-ranlib/Makefile b/tools/llvm-ranlib/Makefile
index b7e477154337b4f78531ff1a1ce7cc4266a36de9..b97c17c79a2a9fbd0adb653cad3ff9c864f0cf55 100644 (file)
--- a/tools/llvm-ranlib/Makefile
+++ b/tools/llvm-ranlib/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-ranlib
-USEDLIBS = LLVMArchive.a LLVMBCReader \
-          LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMArchive.a LLVMBCReader.a \
+          LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm2cpp/Makefile b/tools/llvm2cpp/Makefile
index a15b609b9e4d8b3826a959514f5d9df9e6de06a4..7e778d723d2a99155f4adea436cb27b0a1b6c3a8 100644 (file)
--- a/tools/llvm2cpp/Makefile
+++ b/tools/llvm2cpp/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvm2cpp
-USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMCore \
-           LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \
+           LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvmc/Makefile b/tools/llvmc/Makefile
index 6034f87fe4f503f1b3769d3418495d5297123bb3..79292baa539dcb256c7a75dfcfac9b24cec9cccd 100644 (file)
--- a/tools/llvmc/Makefile
+++ b/tools/llvmc/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvmc
-USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
 CONFIG_FILES = c cpp ll
 EXTRA_DIST = c cpp ll ConfigLexer.cpp.cvs ConfigLexer.l.cvs
 

diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 9ffaa3d4b9412325283ebae672e888d41029548c..c262040ea88985b2a78fdb07e66fa6b0e6a83419 100644 (file)
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -9,9 +9,9 @@
 LEVEL = ../..
 TOOLNAME = opt
 
-USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation.a \
+USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMInstrumentation.a \
           LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure LLVMTransforms.a \
-          LLVMTarget.a LLVMTransformUtils.a LLVMAnalysis.a LLVMCore LLVMSupport.a \
-          LLVMbzip2 LLVMSystem.a 
+          LLVMTarget.a LLVMTransformUtils.a LLVMAnalysis.a LLVMCore.a LLVMSupport.a \
+          LLVMbzip2.a LLVMSystem.a 
 
 include $(LEVEL)/Makefile.common