Update to reflect changes in Makefile rules.

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

54 files changed, 139 insertions, 149 deletions

diff --git a/lib/Analysis/DataStructure/Makefile.am b/lib/Analysis/DataStructure/Makefile.am
index 501dd7a528..03ff3c7c6f 100644
--- a/lib/Analysis/DataStructure/Makefile.am
+++ b/lib/Analysis/DataStructure/Makefile.am
@@ -7,10 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMDataStructure.a
-libexec_PROGRAMS = LLVMDataStructure.o
 
 MYSOURCES = \
   BottomUpClosure.cpp\
@@ -31,5 +30,4 @@ MYSOURCES = \
   TopDownClosure.cpp
 
 libLLVMDataStructure_a_SOURCES = $(MYSOURCES)
-LLVMDataStructure_o_SOURCES = $(MYSOURCES)
-LIBS=
+PRELINK=libLLVMDataStructure.a
diff --git a/lib/Analysis/IPA/Makefile.am b/lib/Analysis/IPA/Makefile.am
index 049ad66ff3..796d38189f 100644
--- a/lib/Analysis/IPA/Makefile.am
+++ b/lib/Analysis/IPA/Makefile.am
@@ -7,10 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-lib_LIBRARIES = libLLVMIPA.a
-libexec_PROGRAMS = LLVMIPA.o
+lib_LIBRARIES = libLLVMIPA.a 
 
 MYSOURCES = \
   Andersens.cpp \
@@ -20,6 +19,7 @@ MYSOURCES = \
   FindUsedTypes.cpp \
   GlobalsModRef.cpp \
   PrintSCC.cpp
+
 libLLVMIPA_a_SOURCES = $(MYSOURCES)
-LLVMIPA_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMIPA.a
diff --git a/lib/Analysis/Makefile.am b/lib/Analysis/Makefile.am
index 43400dba49..fe9830c8c9 100644
--- a/lib/Analysis/Makefile.am
+++ b/lib/Analysis/Makefile.am
@@ -7,12 +7,11 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = IPA DataStructure
 
 lib_LIBRARIES = libLLVMAnalysis.a
-libexec_PROGRAMS = LLVMAnalysis.o
 
 MYSOURCES = \
   AliasAnalysisCounter.cpp \
@@ -36,5 +35,4 @@ MYSOURCES = \
   ValueNumbering.cpp
 
 libLLVMAnalysis_a_SOURCES = $(MYSOURCES)
-LLVMAnalysis_o_SOURCES = $(MYSOURCES)
-LIBS=
+PRELINK=libLLVMAnalysis.a
diff --git a/lib/AsmParser/Makefile.am b/lib/AsmParser/Makefile.am
index deedb97fc1..14f00a2229 100644
--- a/lib/AsmParser/Makefile.am
+++ b/lib/AsmParser/Makefile.am
@@ -7,13 +7,14 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMAsmParser.o
+lib_LIBRARIES = libLLVMAsmParser.a
 
 BUILT_SOURCES = llvmAsmParser.cpp Lexer.cpp llvmAsmParser.h
 
-LLVMAsmParser_o_SOURCES = Parser.cpp $(BUILT_SOURCES)
-LIBS=
+libLLVMAsmParser_a_SOURCES = Parser.cpp $(BUILT_SOURCES)
+
+PRELINK=libLLVMAsmParser.a
 
 Lexer.o: llvmAsmParser.h
diff --git a/lib/Bytecode/Makefile.am b/lib/Bytecode/Makefile.am
index 039100062e..7724041fd9 100644
--- a/lib/Bytecode/Makefile.am
+++ b/lib/Bytecode/Makefile.am
@@ -7,6 +7,6 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = Reader Writer
diff --git a/lib/Bytecode/Reader/Makefile.am b/lib/Bytecode/Reader/Makefile.am
index 0285ce9585..3a809765eb 100644
--- a/lib/Bytecode/Reader/Makefile.am
+++ b/lib/Bytecode/Reader/Makefile.am
@@ -7,15 +7,15 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMBCReader.o
+lib_LIBRARIES = libLLVMBCReader.a
 
-LLVMBCReader_o_SOURCES = \
+libLLVMBCReader_a_SOURCES = \
   Analyzer.cpp \
   ArchiveReader.cpp \
   LibraryReader.cpp \
   Reader.cpp \
   ReaderWrappers.cpp
 
-LIBS=
+PRELINK=libLLVMBCReader.a
diff --git a/lib/Bytecode/Writer/Makefile.am b/lib/Bytecode/Writer/Makefile.am
index 61b4ed858c..6ccd8161ad 100644
--- a/lib/Bytecode/Writer/Makefile.am
+++ b/lib/Bytecode/Writer/Makefile.am
@@ -7,9 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMBCWriter.o
+lib_LIBRARIES = libLLVMBCWriter.a
 
-LLVMBCWriter_o_SOURCES = SlotCalculator.cpp Writer.cpp
-LIBS=
+libLLVMBCWriter_a_SOURCES = SlotCalculator.cpp Writer.cpp
+PRELINK=libLLVMBCWriter.a
diff --git a/lib/CodeGen/Makefile.am b/lib/CodeGen/Makefile.am
index 0f3cdd2fd5..68d09369a5 100644
--- a/lib/CodeGen/Makefile.am
+++ b/lib/CodeGen/Makefile.am
@@ -7,13 +7,13 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = SelectionDAG
 
-libexec_PROGRAMS = LLVMCodeGen.o
+lib_LIBRARIES = libLLVMCodeGen.a
 
-LLVMCodeGen_o_SOURCES = \
+libLLVMCodeGen_a_SOURCES = \
   AsmPrinter.cpp \
   BranchFolding.cpp \
   IntrinsicLowering.cpp \
@@ -35,4 +35,4 @@ LLVMCodeGen_o_SOURCES = \
   UnreachableBlockElim.cpp \
   VirtRegMap.cpp
 
-LIBS=
+PRELINK=libLLVMCodeGen.a
diff --git a/lib/CodeGen/SelectionDAG/Makefile.am b/lib/CodeGen/SelectionDAG/Makefile.am
index d0dbf6d239..51642777d8 100644
--- a/lib/CodeGen/SelectionDAG/Makefile.am
+++ b/lib/CodeGen/SelectionDAG/Makefile.am
@@ -7,9 +7,10 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMSelectionDAG.o
+lib_LIBRARIES = libLLVMSelectionDAG.a
 
-LLVMSelectionDAG_o_SOURCES = DAGBuilder.cpp SelectionDAG.cpp
-LIBS=
+libLLVMSelectionDAG_a_SOURCES = DAGBuilder.cpp SelectionDAG.cpp
+
+PRELINK=libLLVMSelectionDAG.a
diff --git a/lib/Debugger/Makefile.am b/lib/Debugger/Makefile.am
index 8bd0e9ad0d..2a601e6ca8 100644
--- a/lib/Debugger/Makefile.am
+++ b/lib/Debugger/Makefile.am
@@ -7,11 +7,11 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMDebugger.o
+lib_LIBRARIES = libLLVMDebugger.a
 
-LLVMDebugger_o_SOURCES = \
+libLLVMDebugger_a_SOURCES = \
   Debugger.cpp \
   ProgramInfo.cpp \
   RuntimeInfo.cpp \
@@ -22,4 +22,4 @@ LLVMDebugger_o_SOURCES = \
   SourceLanguage-Unknown.cpp \
   UnixLocalInferiorProcess.cpp
 
-LIBS=
+PRELINK=libLLVMDebugger.a
diff --git a/lib/ExecutionEngine/Interpreter/Makefile.am b/lib/ExecutionEngine/Interpreter/Makefile.am
index 650807f609..420de6aa6f 100644
--- a/lib/ExecutionEngine/Interpreter/Makefile.am
+++ b/lib/ExecutionEngine/Interpreter/Makefile.am
@@ -7,11 +7,11 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMInterpreter.o
+lib_LIBRARIES = libLLVMInterpreter.a
 
-LLVMInterpreter_o_SOURCES = \
+libLLVMInterpreter_a_SOURCES = \
   Execution.cpp ExternalFunctions.cpp Interpreter.cpp
 
-LIBS=
+PRELINK=libLLVMInterpreter.a
diff --git a/lib/ExecutionEngine/JIT/Makefile.am b/lib/ExecutionEngine/JIT/Makefile.am
index eb9c589835..a0198d2327 100644
--- a/lib/ExecutionEngine/JIT/Makefile.am
+++ b/lib/ExecutionEngine/JIT/Makefile.am
@@ -7,12 +7,13 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMJIT.o
+lib_LIBRARIES = libLLVMJIT.a
 
-LLVMJIT_o_SOURCES = Emitter.cpp Intercept.cpp JIT.cpp TargetSelect.cpp
-LIBS=
+libLLVMJIT_a_SOURCES = Emitter.cpp Intercept.cpp JIT.cpp TargetSelect.cpp
+
+PRELINK=libLLVMJIT.a
 
 # Enable the X86 JIT if compiling on X86
 if ARCH_X86
diff --git a/lib/ExecutionEngine/Makefile.am b/lib/ExecutionEngine/Makefile.am
index a4e233923e..ada3bc851f 100644
--- a/lib/ExecutionEngine/Makefile.am
+++ b/lib/ExecutionEngine/Makefile.am
@@ -7,11 +7,12 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = Interpreter JIT
 
-libexec_PROGRAMS = LLVMExecutionEngine.o
+lib_LIBRARIES = libLLVMExecutionEngine.a
 
-LLVMExecutionEngine_o_SOURCES = ExecutionEngine.cpp
-LIBS=
+libLLVMExecutionEngine_a_SOURCES = ExecutionEngine.cpp
+
+PRELINK=libLLVMExecutionEngine.a
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cd524c756a..54f2f772dd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-SUBDIRS = Analysis AsmParser Bytecode CodeGen Debugger ExecutionEngine Target \
-          Transforms VMCore
+SUBDIRS = VMCore Bytecode AsmParser Analysis Transforms CodeGen Target \
+          ExecutionEngine Debugger
diff --git a/lib/Support/Makefile.am b/lib/Support/Makefile.am
index dce817c9dc..a1679dad3a 100644
--- a/lib/Support/Makefile.am
+++ b/lib/Support/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMSupport.a
 
diff --git a/lib/System/Makefile.am b/lib/System/Makefile.am
index c54ec0cf17..9e7b3e04ec 100644
--- a/lib/System/Makefile.am
+++ b/lib/System/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMSystem.a
 
diff --git a/lib/Target/CBackend/Makefile.am b/lib/Target/CBackend/Makefile.am
index 217b1cdd6d..009330323a 100644
--- a/lib/Target/CBackend/Makefile.am
+++ b/lib/Target/CBackend/Makefile.am
@@ -7,9 +7,10 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMCWriter.o
+lib_LIBRARIES = libLLVMCWriter.a
 
-LLVMCWriter_o_SOURCES = Writer.cpp
-LIBS=
+libLLVMCWriter_a_SOURCES = Writer.cpp
+
+PRELINK=libLLVMCWriter.a
diff --git a/lib/Target/Makefile.am b/lib/Target/Makefile.am
index 62422471a6..0513c04c89 100644
--- a/lib/Target/Makefile.am
+++ b/lib/Target/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = X86 CBackend PowerPC SparcV9 Skeleton 
 
diff --git a/lib/Target/PowerPC/Makefile.am b/lib/Target/PowerPC/Makefile.am
index aa97dfbfbc..92c3f7eeb7 100644
--- a/lib/Target/PowerPC/Makefile.am
+++ b/lib/Target/PowerPC/Makefile.am
@@ -7,9 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMPowerPC.o
+lib_LIBRARIES = libLLVMPowerPC.a
 
 BUILT_SOURCES = \
   PowerPCGenInstrNames.inc \
@@ -23,7 +23,7 @@ BUILT_SOURCES = \
   PPC64GenRegisterInfo.inc \
   PPC64GenInstrInfo.inc
 
-LLVMPowerPC_o_SOURCES = \
+libLLVMPowerPC_a_SOURCES = \
   PowerPCAsmPrinter.cpp \
   PowerPCBranchSelector.cpp \
   PowerPCTargetMachine.cpp \
@@ -36,6 +36,6 @@ LLVMPowerPC_o_SOURCES = \
   PPC64ISelSimple.cpp \
   PPC64RegisterInfo.cpp
 
-LIBS=
+PRELINK=libLLVMPowerPC.a
 
 $(BUILT_SOURCES) : $(LLVM_TDFILES) $(TBLGEN)
diff --git a/lib/Target/Skeleton/Makefile.am b/lib/Target/Skeleton/Makefile.am
index e9d9d5ab30..b7da9bb105 100644
--- a/lib/Target/Skeleton/Makefile.am
+++ b/lib/Target/Skeleton/Makefile.am
@@ -8,9 +8,9 @@
 #===------------------------------------------------------------------------===#
 
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMSkeleton.o
+lib_LIBRARIES = libLLVMSkeleton.a
 
 BUILT_SOURCES = \
   SkeletonGenRegisterInfo.h.inc \
@@ -19,13 +19,13 @@ BUILT_SOURCES = \
   SkeletonGenInstrNames.inc \
   SkeletonGenInstrInfo.inc
 
-LLVMSkeleton_o_SOURCES = \
+libLLVMSkeleton_a_SOURCES = \
   SkeletonInstrInfo.cpp \
   SkeletonJITInfo.cpp \
   SkeletonRegisterInfo.cpp \
   SkeletonTargetMachine.cpp \
   $(BUILT_SOURCES)
 
-LIBS=
+PRELINK=libLLVMSkeleton.a
 
 $(BUILT_SOURCES) : $(TDFILES) $(TBLGEN)
diff --git a/lib/Target/SparcV9/InstrSched/Makefile.am b/lib/Target/SparcV9/InstrSched/Makefile.am
index 4708c6cd2e..4ce868b875 100644
--- a/lib/Target/SparcV9/InstrSched/Makefile.am
+++ b/lib/Target/SparcV9/InstrSched/Makefile.am
@@ -7,10 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMSparcV9InstrSched.a
-libexec_PROGRAMS = LLVMSparcV9InstrSched.o
 
 MYSOURCES = \
   InstrScheduling.cpp \
@@ -19,5 +18,5 @@ MYSOURCES = \
   SchedPriorities.cpp
 
 libLLVMSparcV9InstrSched_a_SOURCES = $(MYSOURCES)
-LLVMSparcV9InstrSched_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMSparcV9InstrSched.a
diff --git a/lib/Target/SparcV9/LiveVar/Makefile.am b/lib/Target/SparcV9/LiveVar/Makefile.am
index b79d3d73ff..f502d4773d 100644
--- a/lib/Target/SparcV9/LiveVar/Makefile.am
+++ b/lib/Target/SparcV9/LiveVar/Makefile.am
@@ -7,10 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMSparcV9LiveVar.a
-libexec_PROGRAMS = LLVMSparcV9LiveVar.o
 
 MYSOURCES = \
   BBLiveVar.cpp \
@@ -18,5 +17,5 @@ MYSOURCES = \
   ValueSet.cpp
 
 libLLVMSparcV9LiveVar_a_SOURCES = $(MYSOURCES)
-LLVMSparcV9LiveVar_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMSparcV9LiveVar.a
diff --git a/lib/Target/SparcV9/Makefile.am b/lib/Target/SparcV9/Makefile.am
index cb7312f1d9..780eb870e0 100644
--- a/lib/Target/SparcV9/Makefile.am
+++ b/lib/Target/SparcV9/Makefile.am
@@ -7,17 +7,17 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = InstrSched LiveVar ModuloScheduling RegAlloc
 
-libexec_PROGRAMS = LLVMSparcV9.o
+lib_LIBRARIES = libLLVMSparcV9.a
 
 BUILT_SOURCES = \
   SparcV9CodeEmitter.inc \
   SparcV9.burm.cpp 
 
-LLVMSparcV9_o_SOURCES = \
+libLLVMSparcV9_a_SOURCES = \
   EmitBytecodeToAssembly.cpp \
   InternalGlobalMapper.cpp \
   MachineCodeForInstruction.cpp \
@@ -39,7 +39,7 @@ LLVMSparcV9_o_SOURCES = \
   SparcV9TmpInstr.cpp \
   $(BUILT_SOURCES)
 
-LIBS=
+PRELINK=libLLVMSparcV9.a
 
 SparcV9.burg.in1 : SparcV9.burg.in
 	$(CXX) -E $(AM_CPPFLAGS) -x c++ $< | $(SED) '/^#/d' | $(SED) 's/Ydefine/#define/' > $@
diff --git a/lib/Target/SparcV9/RegAlloc/Makefile.am b/lib/Target/SparcV9/RegAlloc/Makefile.am
index f181d1569b..b27c42011c 100644
--- a/lib/Target/SparcV9/RegAlloc/Makefile.am
+++ b/lib/Target/SparcV9/RegAlloc/Makefile.am
@@ -7,10 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMSparcV9RegAlloc.a
-libexec_PROGRAMS = LLVMSparcV9RegAlloc.o
 
 MYSOURCES = \
   IGNode.cpp \
@@ -20,5 +19,5 @@ MYSOURCES = \
   RegClass.cpp
 
 libLLVMSparcV9RegAlloc_a_SOURCES = $(MYSOURCES)
-LLVMSparcV9RegAlloc_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMSparcV9RegAlloc.a
diff --git a/lib/Target/X86/Makefile.am b/lib/Target/X86/Makefile.am
index 8fa7bd995b..67cc9944da 100644
--- a/lib/Target/X86/Makefile.am
+++ b/lib/Target/X86/Makefile.am
@@ -7,9 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMX86.o
+lib_LIBRARIES = libLLVMX86.a
 
 BUILT_SOURCES = \
   X86GenRegisterInfo.h.inc \
@@ -20,7 +20,7 @@ BUILT_SOURCES = \
   X86GenATTAsmWriter.inc \
   X86GenIntelAsmWriter.inc
 
-LLVMX86_o_SOURCES = \
+libLLVMX86_a_SOURCES = \
   X86AsmPrinter.cpp \
   X86CodeEmitter.cpp \
   X86FloatingPoint.cpp \
@@ -31,6 +31,6 @@ LLVMX86_o_SOURCES = \
   X86RegisterInfo.cpp \
   X86TargetMachine.cpp
 
-LIBS=
+PRELINK=libLLVMX86.a
 
 $(BUILT_SOURCES) : $(LLVM_TDFILES) $(TBLGEN)
diff --git a/lib/Transforms/Hello/Makefile.am b/lib/Transforms/Hello/Makefile.am
index 75fa34f896..4cca638c0b 100644
--- a/lib/Transforms/Hello/Makefile.am
+++ b/lib/Transforms/Hello/Makefile.am
@@ -7,9 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMHello.o
+lib_LIBRARIES = libLLVMHello.a
 
-LLVMHello_o_SOURCES = Hello.cpp
-LIBS=
+libLLVMHello_a_SOURCES = Hello.cpp
+PRELINK=libLLVMHello.a
diff --git a/lib/Transforms/IPO/Makefile.am b/lib/Transforms/IPO/Makefile.am
index c10360ff92..e71892ae5f 100644
--- a/lib/Transforms/IPO/Makefile.am
+++ b/lib/Transforms/IPO/Makefile.am
@@ -7,10 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMIPO.a
-libexec_PROGRAMS = LLVMIPO.o
 
 MYSOURCES= \
   ArgumentPromotion.cpp \
@@ -31,5 +30,5 @@ MYSOURCES= \
   RaiseAllocations.cpp
 
 libLLVMIPO_a_SOURCES = $(MYSOURCES)
-LLVMIPO_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMIPO.a
diff --git a/lib/Transforms/Instrumentation/Makefile.am b/lib/Transforms/Instrumentation/Makefile.am
index 4e716557ad..a5cac36c46 100644
--- a/lib/Transforms/Instrumentation/Makefile.am
+++ b/lib/Transforms/Instrumentation/Makefile.am
@@ -7,12 +7,11 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = ProfilePaths
 
 lib_LIBRARIES = libLLVMInstrument.a
-libexec_PROGRAMS = LLVMInstrument.o
 
 MYSOURCES = \
   BlockProfiling.cpp \
@@ -23,5 +22,5 @@ MYSOURCES = \
   TraceValues.cpp
 
 libLLVMInstrument_a_SOURCES = $(MYSOURCES)
-LLVMInstrument_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMInstrument.a
diff --git a/lib/Transforms/Instrumentation/ProfilePaths/Makefile.am b/lib/Transforms/Instrumentation/ProfilePaths/Makefile.am
index 62874a0641..0bce3ac1f9 100644
--- a/lib/Transforms/Instrumentation/ProfilePaths/Makefile.am
+++ b/lib/Transforms/Instrumentation/ProfilePaths/Makefile.am
@@ -7,10 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMProfilePaths.a
-libexec_PROGRAMS = LLVMProfilePaths.o
 
 MYSOURCES= \
   CombineBranch.cpp \
@@ -22,5 +21,5 @@ MYSOURCES= \
   RetracePath.cpp
 
 libLLVMProfilePaths_a_SOURCES = $(MYSOURCES)
-LLVMProfilePaths_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMProfilePaths.a
diff --git a/lib/Transforms/Makefile.am b/lib/Transforms/Makefile.am
index cf6ac8089a..8f8b9e1d14 100644
--- a/lib/Transforms/Makefile.am
+++ b/lib/Transforms/Makefile.am
@@ -7,15 +7,14 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = Utils Instrumentation Scalar IPO
 
 lib_LIBRARIES = libLLVMTransforms.a
-libexec_PROGRAMS = LLVMTransforms.o
 
 MYSOURCES = ExprTypeConvert.cpp LevelRaise.cpp TransformInternals.cpp
 
 libLLVMTransforms_a_SOURCES = $(MYSOURCES)
-LLVMTransforms_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMTransforms.a
diff --git a/lib/Transforms/Scalar/Makefile.am b/lib/Transforms/Scalar/Makefile.am
index 6271fde32e..72a5db7cac 100644
--- a/lib/Transforms/Scalar/Makefile.am
+++ b/lib/Transforms/Scalar/Makefile.am
@@ -7,10 +7,10 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMScalarOpts.a
-libexec_PROGRAMS = LLVMScalarOpts.o
+PRELINK=libLLVMScalarOpts.a
 
 MYSOURCES = \
   ADCE.cpp \
@@ -46,5 +46,3 @@ MYSOURCES = \
 
 libLLVMScalarOpts_a_SOURCES = $(MYSOURCES)
 
-LLVMScalarOpts_o_SOURCES = $(MYSOURCES)
-LIBS=
diff --git a/lib/Transforms/Utils/Makefile.am b/lib/Transforms/Utils/Makefile.am
index e5a2a66744..65c8ad497e 100644
--- a/lib/Transforms/Utils/Makefile.am
+++ b/lib/Transforms/Utils/Makefile.am
@@ -7,10 +7,9 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 lib_LIBRARIES = libLLVMTransformUtils.a
-libexec_PROGRAMS = LLVMTransformUtils.o
 
 MYSOURCES = \
   BasicBlockUtils.cpp \
@@ -28,5 +27,5 @@ MYSOURCES = \
   ValueMapper.cpp
 
 libLLVMTransformUtils_a_SOURCES = $(MYSOURCES)
-LLVMTransformUtils_o_SOURCES = $(MYSOURCES)
-LIBS=
+
+PRELINK=libLLVMTransformUtils.a
diff --git a/lib/VMCore/Makefile.am b/lib/VMCore/Makefile.am
index f9efdf6106..a5396ceb6d 100644
--- a/lib/VMCore/Makefile.am
+++ b/lib/VMCore/Makefile.am
@@ -7,11 +7,11 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-libexec_PROGRAMS = LLVMCore.o
+lib_LIBRARIES = libLLVMCore.a
 
-LLVMCore_o_SOURCES = \
+libLLVMCore_a_SOURCES = \
   AsmWriter.cpp \
   BasicBlock.cpp \
   ConstantFolding.cpp \
@@ -34,4 +34,4 @@ LLVMCore_o_SOURCES = \
   Value.cpp \
   Verifier.cpp
 
-LIBS=
+PRELINK=libLLVMCore.a
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a859c26e21..64c50f44b9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = analyze llvmc bugpoint extract gccas gccld llvm-bcanalyzer llc \
           llee lli llvm-ar llvm-as llvm-db llvm-dis llvm-link llvm-nm \
diff --git a/tools/analyze/Makefile.am b/tools/analyze/Makefile.am
index 7bad54c001..b54c7b3cf7 100644
--- a/tools/analyze/Makefile.am
+++ b/tools/analyze/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = analyze
 
@@ -16,9 +16,6 @@ analyze_SOURCES = \
   analyze.cpp \
   GraphPrinters.cpp
 
-#USEDLIBS = asmparser bcreader analysis ipa datastructure scalaropts.a transforms.a \
-#           target.a scalaropts.a transformutils.a vmcore support LLVMsystem.a
-
 analyze_LDADD = \
   $(call GETOBJS,AsmParser,BCReader,Core) \
   $(call GETLIBS,Analysis,IPA,DataStructure,ScalarOpts,Transforms,Target) \
diff --git a/tools/bugpoint/Makefile.am b/tools/bugpoint/Makefile.am
index 312d4917d4..600f854513 100644
--- a/tools/bugpoint/Makefile.am
+++ b/tools/bugpoint/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = bugpoint
 
@@ -22,6 +22,8 @@ bugpoint_SOURCES = \
   TestPasses.cpp
 
 bugpoint_LDADD = \
-  $(call GETOBJS,AsmParser,BCReader,BCWriter,Core,ProfilePaths) \
-  $(call GETLIBS,IPO,ScalarOpts,Analysis,Transforms,Instrument) \
-  $(call GETLIBS,DataStructure,IPA,Target,TransformUtils,Support,System)
+  $(call GETOBJS,IPO,ScalarOpts,Analysis,Transforms,Instrument,ProfilePaths) \
+  $(call GETOBJS,DataStructure,IPA) \
+  $(call GETLIBS,Target) \
+  $(call GETOBJS,TransformUtils,AsmParser,BCReader,BCWriter,Core) \
+  $(call GETLIBS,Support,System)
diff --git a/tools/extract/Makefile.am b/tools/extract/Makefile.am
index 56977c15b7..9af226a800 100644
--- a/tools/extract/Makefile.am
+++ b/tools/extract/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = extract
 
diff --git a/tools/gccas/Makefile.am b/tools/gccas/Makefile.am
index b6b6d0b834..64ac578a01 100644
--- a/tools/gccas/Makefile.am
+++ b/tools/gccas/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = gccas
 
diff --git a/tools/gccld/Makefile.am b/tools/gccld/Makefile.am
index e88b9abfed..0f98ab1318 100644
--- a/tools/gccld/Makefile.am
+++ b/tools/gccld/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = gccld
 
diff --git a/tools/llc/Makefile.am b/tools/llc/Makefile.am
index 2513cad482..6aacba6d10 100644
--- a/tools/llc/Makefile.am
+++ b/tools/llc/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llc
 
diff --git a/tools/llee/Makefile.am b/tools/llee/Makefile.am
index 36700ff50d..d085c87c36 100644
--- a/tools/llee/Makefile.am
+++ b/tools/llee/Makefile.am
@@ -7,11 +7,11 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-lib_LIBRARIES = libexecve.a
+lib_LTLIBRARIES = libexecve.la
 
-libexecve_a_SOURCES = ExecveHandler.c StorageProxy.c SysUtils.c
+libexecve_la_SOURCES = ExecveHandler.c StorageProxy.c SysUtils.c
 
 all: llee
 
diff --git a/tools/lli/Makefile.am b/tools/lli/Makefile.am
index 9fa36eeb7c..e310951f3d 100644
--- a/tools/lli/Makefile.am
+++ b/tools/lli/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = lli
 
diff --git a/tools/llvm-ar/Makefile.am b/tools/llvm-ar/Makefile.am
index abc639911c..1bc5844e73 100644
--- a/tools/llvm-ar/Makefile.am
+++ b/tools/llvm-ar/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-ar
 
diff --git a/tools/llvm-as/Makefile.am b/tools/llvm-as/Makefile.am
index 52831f4499..31a8487159 100644
--- a/tools/llvm-as/Makefile.am
+++ b/tools/llvm-as/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-as
 
diff --git a/tools/llvm-bcanalyzer/Makefile.am b/tools/llvm-bcanalyzer/Makefile.am
index a898f7eefa..cb83e9c693 100644
--- a/tools/llvm-bcanalyzer/Makefile.am
+++ b/tools/llvm-bcanalyzer/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-bcanalyzer
 
diff --git a/tools/llvm-db/Makefile.am b/tools/llvm-db/Makefile.am
index a7a5ed8162..42d7d418de 100644
--- a/tools/llvm-db/Makefile.am
+++ b/tools/llvm-db/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-db
 
diff --git a/tools/llvm-dis/Makefile.am b/tools/llvm-dis/Makefile.am
index e379c1c86a..de606dd06c 100644
--- a/tools/llvm-dis/Makefile.am
+++ b/tools/llvm-dis/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-dis
 
diff --git a/tools/llvm-ld/Makefile.am b/tools/llvm-ld/Makefile.am
index 678c064733..c6aa9931c9 100644
--- a/tools/llvm-ld/Makefile.am
+++ b/tools/llvm-ld/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-ld
 
diff --git a/tools/llvm-link/Makefile.am b/tools/llvm-link/Makefile.am
index 575ff28a20..cc285a9a94 100644
--- a/tools/llvm-link/Makefile.am
+++ b/tools/llvm-link/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-link
 
diff --git a/tools/llvm-nm/Makefile.am b/tools/llvm-nm/Makefile.am
index 57f7650314..d04c760764 100644
--- a/tools/llvm-nm/Makefile.am
+++ b/tools/llvm-nm/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-nm
 
diff --git a/tools/llvm-prof/Makefile.am b/tools/llvm-prof/Makefile.am
index 1e942d37bd..2465361ec9 100644
--- a/tools/llvm-prof/Makefile.am
+++ b/tools/llvm-prof/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-prof
 
diff --git a/tools/llvm-stub/Makefile.am b/tools/llvm-stub/Makefile.am
index e4c867d014..aa5119cc6c 100644
--- a/tools/llvm-stub/Makefile.am
+++ b/tools/llvm-stub/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-stub
 
diff --git a/tools/llvmc/Makefile.am b/tools/llvmc/Makefile.am
index ac1b398fff..125e041aea 100644
--- a/tools/llvmc/Makefile.am
+++ b/tools/llvmc/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvmc
 
diff --git a/tools/opt/Makefile.am b/tools/opt/Makefile.am
index 14cbaade0e..9c37905ded 100644
--- a/tools/opt/Makefile.am
+++ b/tools/opt/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = opt