Update to reflect changes in Makefile rules.

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

diff --git a/lib/Analysis/DataStructure/Makefile.am b/lib/Analysis/DataStructure/Makefile.am
index 501dd7a528d8fd731c3fcf476b016582f6c82b34..03ff3c7c6fb7f48eb026607e381a70675cfdac66 100644 (file)
--- 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 049ad66ff38794e5b90cfce386bce867e2b1260f..796d38189f406930288c633bd2cfb13d7a6e86c5 100644 (file)
--- 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 43400dba49e115eedb4c0c927da2d4b8a01fd2e4..fe9830c8c9630f9fe2f02dd419ff225a0cbaff93 100644 (file)
--- 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 deedb97fc1b6c49f45122dab2ede5c108b037e3e..14f00a2229e6ce05b37b6d230954ab27448f2905 100644 (file)
--- 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 039100062e92a44133861d558acb9d9442176128..7724041fd95467b4363d017bd551a3cbf69e79cf 100644 (file)
--- 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 0285ce9585d0bdab89551e0dd64e96e8e6a06d82..3a809765eb4f6a439b8e88bd45aa99d4cbaac738 100644 (file)
--- 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 61b4ed858cd2a7858052b68665f9e7cb1e30abe3..6ccd8161ad8ae85f6a092f157211c067cf3bed9c 100644 (file)
--- 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 0f3cdd2fd5b23f7ba326227253f780cecd107599..68d09369a58fa905be179d654737ae5f644b88a0 100644 (file)
--- 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 d0dbf6d23977eb097b42df28d9547e704db3300c..51642777d8692c5fcbd0a0db2463df96232f1a9a 100644 (file)
--- 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 8bd0e9ad0de128d9e3a2a87c79351bc291480cf2..2a601e6ca837abecf28d9567c335eb0c8a6e2daf 100644 (file)
--- 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 650807f60969b0ce6874ece57c3620eafcd5f12e..420de6aa6fa9dbbb80107a2daca1f981e261636b 100644 (file)
--- 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 eb9c589835c1f58905a734b1cc275eab6df111af..a0198d2327d4fc268dec34e02ae5558c6d79d4c2 100644 (file)
--- 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 a4e233923ec704c8238f2aef91401b54908e8088..ada3bc851f408d6fc63c27dd284087728c9cf183 100644 (file)
--- 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 cd524c756ae015f5b0cc999cf1748df068204c01..54f2f772dd8f1ced11150c194ebabeaa52330c25 100644 (file)
--- 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 dce817c9dc5d41f86660a435e14fab872f2c69f6..a1679dad3a835a4263d199f2eab46f4254514193 100644 (file)
--- 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 c54ec0cf17861cf9784611e2c57d91a6055a4f71..9e7b3e04ec1b7f00aff9ba80046118760148209b 100644 (file)
--- 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 217b1cdd6dd0c60227dd605bdacd856d1da78561..009330323afbde3d033f98867b3a0894c588156d 100644 (file)
--- 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 62422471a61b31bfb7d539a514323f5f28b05885..0513c04c89f66446a531df3cc8fa43eb823fcf61 100644 (file)
--- 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 aa97dfbfbc37de5b1fee04dec7ac56434d39fda3..92c3f7eeb74867057c50991bd5b8fa8bdbb44558 100644 (file)
--- 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 e9d9d5ab30949b0766d773ded51a9615e50b0d3b..b7da9bb1050cbd32c42dd12ad792a6f8604d1960 100644 (file)
--- 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 4708c6cd2e342bb2aa0a8b96dbb2713c130a97fc..4ce868b875145752c28f5cc68ac799ac621e7d7b 100644 (file)
--- 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 b79d3d73ff71b2d8ea60382f7442fa75d3c495d1..f502d4773db1944b9d194a6388c495be7cbb9588 100644 (file)
--- 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 cb7312f1d9570345847cf9a612789ec78cd87c89..780eb870e090264586f560fc0389391da6adb079 100644 (file)
--- 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 f181d1569b361bd9e444cb4db7a62c1981f074f2..b27c42011c97387a7db37e806244f427344c1cfb 100644 (file)
--- 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 8fa7bd995b6502805440bc4a2cc43976e8b584e1..67cc9944da3e34eaede3c3ff1d20e1d31f21e902 100644 (file)
--- 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 75fa34f896f7d839e1066363c0e6b50995ffbc2b..4cca638c0b65bfe92aacbb644cda70ce10215be4 100644 (file)
--- 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 c10360ff9285e11caf56daed1bee448900c9a331..e71892ae5f3a2faef82c22a8e3462269df72d41a 100644 (file)
--- 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 4e716557ad08c7d07b38731688fe35ecba4018ee..a5cac36c469016718db0c1b85697c4eb5e0d2fd0 100644 (file)
--- 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 62874a0641f94ad06f2e60a0352a7ce22facfe0f..0bce3ac1f9375e4ba54051b2f558c216a0d333cd 100644 (file)
--- 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 cf6ac8089a61689766902c50895435d1806172ba..8f8b9e1d14951e0dd203c5dc1b05b2cd9e088820 100644 (file)
--- 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 6271fde32e8e61f18e4c05ef8369b12d3a3997a3..72a5db7cac8bd657ff6f28117c4ee9f43ed82d81 100644 (file)
--- 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 e5a2a667442ecc5b69b803d232e857f94b9a3e88..65c8ad497e97470a8013e21a88d568dd1bd27a59 100644 (file)
--- 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 f9efdf6106b41ce1ed86da6fca18924207638c20..a5396ceb6d87fce7ba23065dc3195034e44ffe5f 100644 (file)
--- 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 a859c26e2148e28f0a0e5c5e2fdb41aef1481b0b..64c50f44b96bea500173c94c3852dcefe8fa31c3 100644 (file)
--- 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 7bad54c00117b560ec41c5f9ef485d7d88af66c6..b54c7b3cf786e95d5cbea96ded569f8811e0fe55 100644 (file)
--- 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 312d4917d4f5a72d3dc04cc6e6b8b73c70029172..600f854513e9f36280f3ac1907fcb6d3ae448fd8 100644 (file)
--- 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 56977c15b733310b6360932c401c4f3b7612a423..9af226a80053db601be29fa799e234cb3dc9f18a 100644 (file)
--- 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 b6b6d0b834beca873cbd4a4d98c6cd471dfae455..64ac578a0196792a2dc55ee797ad08e6e0f95345 100644 (file)
--- 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 e88b9abfed38da0de2e7b61a8da7287869d90f80..0f98ab13188c6f59d1a9eff8110bc48da8650ba8 100644 (file)
--- 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 2513cad48251488b6aa3e8146843d9113bedf127..6aacba6d101dc0bd3eb9886aab30954ff01d792a 100644 (file)
--- 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 36700ff50dee204fa00f60cf1d6f681319f66e06..d085c87c363fc326ca8cdaccbdfc1bf9dc977c2a 100644 (file)
--- 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 9fa36eeb7c3964065125fe4eeaab6b0ba684ad5c..e310951f3de85af510f16d2e035fda98fc90e4bd 100644 (file)
--- 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 abc639911c1cb80cc416dbb110c90498397cc165..1bc5844e73d5eaf602e7482ef71fa54cdfaa7466 100644 (file)
--- 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 52831f4499190653d7bf3b7688ba6fbe1d8cf174..31a8487159e6b5530a10db2fe09b2bfae1379c9a 100644 (file)
--- 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 a898f7eefa035f56f69c6f1a9c78020beded1433..cb83e9c6939e96498431e03d54ddad6dcd169b5f 100644 (file)
--- 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 a7a5ed8162ac1c09d7f1a8dd70df3deda60c0d70..42d7d418de78299c4be40a673ac290051f0cc57e 100644 (file)
--- 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 e379c1c86a20a86fe6d63713800012c07f1e8e24..de606dd06c94c9142cd0714510815c93d5233078 100644 (file)
--- 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 678c064733e6728e894b5a2db42daa878d28013d..c6aa9931c9938b735c53c66ac0462e240ba636b5 100644 (file)
--- 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 575ff28a20bd88ab80e26e0b94dd06620d9a2a28..cc285a9a94bbf74c0e932f980ca839ed04500517 100644 (file)
--- 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 57f7650314eb7187e563e4ff9d8140d799b85dac..d04c7607643773494266c6a048cc802529baa418 100644 (file)
--- 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 1e942d37bd2e04698f6a473c81e694c63e51693b..2465361ec9821c5f3733fdf36f34e636ce269397 100644 (file)
--- 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 e4c867d014fa801bddb873601e7703cc362df177..aa5119cc6cadf60cda739f2d39a2ab896d56713a 100644 (file)
--- 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 ac1b398fff05af038ae3f3ee4b46c13c926e0220..125e041aea790a626a42ffadff5962e3161806de 100644 (file)
--- 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 14cbaade0ef9af90eeffd7242279128e8c9deb4f..9c37905ded486cb1bb570b42be53a497661a4a6c 100644 (file)
--- 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