summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2006-06-01 01:30:27 +0000
committerReid Spencer <rspencer@reidspencer.com>2006-06-01 01:30:27 +0000
commit18c8b49e7d3c94d7f84a4205a19f8761722fc4e5 (patch)
treeaaf98198e3188a56c28aa9baa52de35b6dcca3f0
parentb756c79d125c402931d0852f34c3444e947fcc8a (diff)
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
-rw-r--r--Makefile.rules4
-rw-r--r--examples/ModuleMaker/Makefile2
-rw-r--r--lib/AsmParser/Makefile1
-rw-r--r--lib/Bytecode/Reader/Makefile1
-rw-r--r--lib/Bytecode/Writer/Makefile1
-rw-r--r--lib/CodeGen/Makefile2
-rw-r--r--lib/CodeGen/SelectionDAG/Makefile2
-rw-r--r--lib/Support/bzip2/Makefile1
-rw-r--r--lib/Target/CBackend/Makefile2
-rw-r--r--lib/VMCore/Makefile6
-rw-r--r--projects/Stacker/tools/stkrc/Makefile6
-rw-r--r--runtime/GC/SemiSpace/Makefile2
-rw-r--r--runtime/GCCLibraries/libc/Makefile4
-rw-r--r--runtime/libtrace/Makefile2
-rw-r--r--tools/analyze/Makefile4
-rw-r--r--tools/bugpoint/Makefile4
-rw-r--r--tools/gccas/Makefile4
-rw-r--r--tools/gccld/Makefile4
-rw-r--r--tools/llc/Makefile10
-rw-r--r--tools/llvm-ar/Makefile4
-rw-r--r--tools/llvm-as/Makefile4
-rw-r--r--tools/llvm-bcanalyzer/Makefile2
-rw-r--r--tools/llvm-db/Makefile3
-rw-r--r--tools/llvm-dis/Makefile2
-rw-r--r--tools/llvm-extract/Makefile6
-rw-r--r--tools/llvm-ld/Makefile4
-rw-r--r--tools/llvm-link/Makefile4
-rw-r--r--tools/llvm-nm/Makefile4
-rw-r--r--tools/llvm-prof/Makefile4
-rw-r--r--tools/llvm-ranlib/Makefile4
-rw-r--r--tools/llvm2cpp/Makefile4
-rw-r--r--tools/llvmc/Makefile2
-rw-r--r--tools/opt/Makefile6
33 files changed, 61 insertions, 54 deletions
diff --git a/Makefile.rules b/Makefile.rules
index b719e8c1303..acef6608130 100644
--- 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 a9e40742cee..e24e0df49d7 100644
--- 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 f10aaba4582..01bbc810459 100644
--- 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 cdfa11b1f1f..a86d008715f 100644
--- 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 e1bf0da87db..e731bb14a9f 100644
--- 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 05453a36ef7..744f8e937b9 100644
--- 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 85aafab0b84..73d9edb9908 100644
--- 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 6294a4b13a7..fc16c4def43 100644
--- 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 fc32db0a40e..ac6ff3bb530 100644
--- 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 c961020372e..6c2137eaddb 100644
--- 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 8814b92ef06..cfe553b857f 100644
--- 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 8aaa29c8cb0..6f8e54ce276 100644
--- 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 c2106e01fd4..4dc2f88a92e 100644
--- 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 b39ca6b10ca..9a070703746 100644
--- 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 06def88d01a..0f0eb72628e 100644
--- 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 6460aa82aa2..338122ac148 100644
--- 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 32c10c88658..55b0379941a 100644
--- 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 96e73d68713..44c6be9834b 100644
--- 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 ed48accf2be..fe744039636 100644
--- 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 3375f9ee365..fbc2bcf3530 100644
--- 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 91de6d2490b..73dcb06aff4 100644
--- 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 3793cfbfd65..79146463142 100644
--- 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 e5b0d2916b6..31ebbba59cd 100644
--- 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 ebf21c461f3..8e54fb347c8 100644
--- 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 80a90fa41a8..73d5883403a 100644
--- 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 34d6dc69ca4..eb2158a252a 100644
--- 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 9c3fa53113d..41594f2c51e 100644
--- 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 9868b2ab9ae..996b3494de9 100644
--- 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 b0d4b3e5796..029297a5711 100644
--- 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 b7e47715433..b97c17c79a2 100644
--- 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 a15b609b9e4..7e778d723d2 100644
--- 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 6034f87fe4f..79292baa539 100644
--- 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 9ffaa3d4b94..c262040ea88 100644
--- 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