diff options
54 files changed, 139 insertions, 149 deletions
diff --git a/llvm/lib/Analysis/DataStructure/Makefile.am b/llvm/lib/Analysis/DataStructure/Makefile.am index 501dd7a528d..03ff3c7c6fb 100644 --- a/llvm/lib/Analysis/DataStructure/Makefile.am +++ b/llvm/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/llvm/lib/Analysis/IPA/Makefile.am b/llvm/lib/Analysis/IPA/Makefile.am index 049ad66ff38..796d38189f4 100644 --- a/llvm/lib/Analysis/IPA/Makefile.am +++ b/llvm/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/llvm/lib/Analysis/Makefile.am b/llvm/lib/Analysis/Makefile.am index 43400dba49e..fe9830c8c96 100644 --- a/llvm/lib/Analysis/Makefile.am +++ b/llvm/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/llvm/lib/AsmParser/Makefile.am b/llvm/lib/AsmParser/Makefile.am index deedb97fc1b..14f00a2229e 100644 --- a/llvm/lib/AsmParser/Makefile.am +++ b/llvm/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/llvm/lib/Bytecode/Makefile.am b/llvm/lib/Bytecode/Makefile.am index 039100062e9..7724041fd95 100644 --- a/llvm/lib/Bytecode/Makefile.am +++ b/llvm/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/llvm/lib/Bytecode/Reader/Makefile.am b/llvm/lib/Bytecode/Reader/Makefile.am index 0285ce9585d..3a809765eb4 100644 --- a/llvm/lib/Bytecode/Reader/Makefile.am +++ b/llvm/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/llvm/lib/Bytecode/Writer/Makefile.am b/llvm/lib/Bytecode/Writer/Makefile.am index 61b4ed858cd..6ccd8161ad8 100644 --- a/llvm/lib/Bytecode/Writer/Makefile.am +++ b/llvm/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/llvm/lib/CodeGen/Makefile.am b/llvm/lib/CodeGen/Makefile.am index 0f3cdd2fd5b..68d09369a58 100644 --- a/llvm/lib/CodeGen/Makefile.am +++ b/llvm/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/llvm/lib/CodeGen/SelectionDAG/Makefile.am b/llvm/lib/CodeGen/SelectionDAG/Makefile.am index d0dbf6d2397..51642777d86 100644 --- a/llvm/lib/CodeGen/SelectionDAG/Makefile.am +++ b/llvm/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/llvm/lib/Debugger/Makefile.am b/llvm/lib/Debugger/Makefile.am index 8bd0e9ad0de..2a601e6ca83 100644 --- a/llvm/lib/Debugger/Makefile.am +++ b/llvm/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/llvm/lib/ExecutionEngine/Interpreter/Makefile.am b/llvm/lib/ExecutionEngine/Interpreter/Makefile.am index 650807f6096..420de6aa6fa 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/Makefile.am +++ b/llvm/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/llvm/lib/ExecutionEngine/JIT/Makefile.am b/llvm/lib/ExecutionEngine/JIT/Makefile.am index eb9c589835c..a0198d2327d 100644 --- a/llvm/lib/ExecutionEngine/JIT/Makefile.am +++ b/llvm/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/llvm/lib/ExecutionEngine/Makefile.am b/llvm/lib/ExecutionEngine/Makefile.am index a4e233923ec..ada3bc851f4 100644 --- a/llvm/lib/ExecutionEngine/Makefile.am +++ b/llvm/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/llvm/lib/Makefile.am b/llvm/lib/Makefile.am index cd524c756ae..54f2f772dd8 100644 --- a/llvm/lib/Makefile.am +++ b/llvm/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/llvm/lib/Support/Makefile.am b/llvm/lib/Support/Makefile.am index dce817c9dc5..a1679dad3a8 100644 --- a/llvm/lib/Support/Makefile.am +++ b/llvm/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/llvm/lib/System/Makefile.am b/llvm/lib/System/Makefile.am index c54ec0cf178..9e7b3e04ec1 100644 --- a/llvm/lib/System/Makefile.am +++ b/llvm/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/llvm/lib/Target/CBackend/Makefile.am b/llvm/lib/Target/CBackend/Makefile.am index 217b1cdd6dd..009330323af 100644 --- a/llvm/lib/Target/CBackend/Makefile.am +++ b/llvm/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/llvm/lib/Target/Makefile.am b/llvm/lib/Target/Makefile.am index 62422471a61..0513c04c89f 100644 --- a/llvm/lib/Target/Makefile.am +++ b/llvm/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/llvm/lib/Target/PowerPC/Makefile.am b/llvm/lib/Target/PowerPC/Makefile.am index aa97dfbfbc3..92c3f7eeb74 100644 --- a/llvm/lib/Target/PowerPC/Makefile.am +++ b/llvm/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/llvm/lib/Target/Skeleton/Makefile.am b/llvm/lib/Target/Skeleton/Makefile.am index e9d9d5ab309..b7da9bb1050 100644 --- a/llvm/lib/Target/Skeleton/Makefile.am +++ b/llvm/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/llvm/lib/Target/SparcV9/InstrSched/Makefile.am b/llvm/lib/Target/SparcV9/InstrSched/Makefile.am index 4708c6cd2e3..4ce868b8751 100644 --- a/llvm/lib/Target/SparcV9/InstrSched/Makefile.am +++ b/llvm/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/llvm/lib/Target/SparcV9/LiveVar/Makefile.am b/llvm/lib/Target/SparcV9/LiveVar/Makefile.am index b79d3d73ff7..f502d4773db 100644 --- a/llvm/lib/Target/SparcV9/LiveVar/Makefile.am +++ b/llvm/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/llvm/lib/Target/SparcV9/Makefile.am b/llvm/lib/Target/SparcV9/Makefile.am index cb7312f1d95..780eb870e09 100644 --- a/llvm/lib/Target/SparcV9/Makefile.am +++ b/llvm/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/llvm/lib/Target/SparcV9/RegAlloc/Makefile.am b/llvm/lib/Target/SparcV9/RegAlloc/Makefile.am index f181d1569b3..b27c42011c9 100644 --- a/llvm/lib/Target/SparcV9/RegAlloc/Makefile.am +++ b/llvm/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/llvm/lib/Target/X86/Makefile.am b/llvm/lib/Target/X86/Makefile.am index 8fa7bd995b6..67cc9944da3 100644 --- a/llvm/lib/Target/X86/Makefile.am +++ b/llvm/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/llvm/lib/Transforms/Hello/Makefile.am b/llvm/lib/Transforms/Hello/Makefile.am index 75fa34f896f..4cca638c0b6 100644 --- a/llvm/lib/Transforms/Hello/Makefile.am +++ b/llvm/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/llvm/lib/Transforms/IPO/Makefile.am b/llvm/lib/Transforms/IPO/Makefile.am index c10360ff928..e71892ae5f3 100644 --- a/llvm/lib/Transforms/IPO/Makefile.am +++ b/llvm/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/llvm/lib/Transforms/Instrumentation/Makefile.am b/llvm/lib/Transforms/Instrumentation/Makefile.am index 4e716557ad0..a5cac36c469 100644 --- a/llvm/lib/Transforms/Instrumentation/Makefile.am +++ b/llvm/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/llvm/lib/Transforms/Instrumentation/ProfilePaths/Makefile.am b/llvm/lib/Transforms/Instrumentation/ProfilePaths/Makefile.am index 62874a0641f..0bce3ac1f93 100644 --- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/Makefile.am +++ b/llvm/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/llvm/lib/Transforms/Makefile.am b/llvm/lib/Transforms/Makefile.am index cf6ac8089a6..8f8b9e1d149 100644 --- a/llvm/lib/Transforms/Makefile.am +++ b/llvm/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/llvm/lib/Transforms/Scalar/Makefile.am b/llvm/lib/Transforms/Scalar/Makefile.am index 6271fde32e8..72a5db7cac8 100644 --- a/llvm/lib/Transforms/Scalar/Makefile.am +++ b/llvm/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/llvm/lib/Transforms/Utils/Makefile.am b/llvm/lib/Transforms/Utils/Makefile.am index e5a2a667442..65c8ad497e9 100644 --- a/llvm/lib/Transforms/Utils/Makefile.am +++ b/llvm/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/llvm/lib/VMCore/Makefile.am b/llvm/lib/VMCore/Makefile.am index f9efdf6106b..a5396ceb6d8 100644 --- a/llvm/lib/VMCore/Makefile.am +++ b/llvm/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/llvm/tools/Makefile.am b/llvm/tools/Makefile.am index a859c26e214..64c50f44b96 100644 --- a/llvm/tools/Makefile.am +++ b/llvm/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/llvm/tools/analyze/Makefile.am b/llvm/tools/analyze/Makefile.am index 7bad54c0011..b54c7b3cf78 100644 --- a/llvm/tools/analyze/Makefile.am +++ b/llvm/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/llvm/tools/bugpoint/Makefile.am b/llvm/tools/bugpoint/Makefile.am index 312d4917d4f..600f854513e 100644 --- a/llvm/tools/bugpoint/Makefile.am +++ b/llvm/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/llvm/tools/extract/Makefile.am b/llvm/tools/extract/Makefile.am index 56977c15b73..9af226a8005 100644 --- a/llvm/tools/extract/Makefile.am +++ b/llvm/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/llvm/tools/gccas/Makefile.am b/llvm/tools/gccas/Makefile.am index b6b6d0b834b..64ac578a019 100644 --- a/llvm/tools/gccas/Makefile.am +++ b/llvm/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/llvm/tools/gccld/Makefile.am b/llvm/tools/gccld/Makefile.am index e88b9abfed3..0f98ab13188 100644 --- a/llvm/tools/gccld/Makefile.am +++ b/llvm/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/llvm/tools/llc/Makefile.am b/llvm/tools/llc/Makefile.am index 2513cad4825..6aacba6d101 100644 --- a/llvm/tools/llc/Makefile.am +++ b/llvm/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/llvm/tools/llee/Makefile.am b/llvm/tools/llee/Makefile.am index 36700ff50de..d085c87c363 100644 --- a/llvm/tools/llee/Makefile.am +++ b/llvm/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/llvm/tools/lli/Makefile.am b/llvm/tools/lli/Makefile.am index 9fa36eeb7c3..e310951f3de 100644 --- a/llvm/tools/lli/Makefile.am +++ b/llvm/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/llvm/tools/llvm-ar/Makefile.am b/llvm/tools/llvm-ar/Makefile.am index abc639911c1..1bc5844e73d 100644 --- a/llvm/tools/llvm-ar/Makefile.am +++ b/llvm/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/llvm/tools/llvm-as/Makefile.am b/llvm/tools/llvm-as/Makefile.am index 52831f44991..31a8487159e 100644 --- a/llvm/tools/llvm-as/Makefile.am +++ b/llvm/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/llvm/tools/llvm-bcanalyzer/Makefile.am b/llvm/tools/llvm-bcanalyzer/Makefile.am index a898f7eefa0..cb83e9c6939 100644 --- a/llvm/tools/llvm-bcanalyzer/Makefile.am +++ b/llvm/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/llvm/tools/llvm-db/Makefile.am b/llvm/tools/llvm-db/Makefile.am index a7a5ed8162a..42d7d418de7 100644 --- a/llvm/tools/llvm-db/Makefile.am +++ b/llvm/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/llvm/tools/llvm-dis/Makefile.am b/llvm/tools/llvm-dis/Makefile.am index e379c1c86a2..de606dd06c9 100644 --- a/llvm/tools/llvm-dis/Makefile.am +++ b/llvm/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/llvm/tools/llvm-ld/Makefile.am b/llvm/tools/llvm-ld/Makefile.am index 678c064733e..c6aa9931c99 100644 --- a/llvm/tools/llvm-ld/Makefile.am +++ b/llvm/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/llvm/tools/llvm-link/Makefile.am b/llvm/tools/llvm-link/Makefile.am index 575ff28a20b..cc285a9a94b 100644 --- a/llvm/tools/llvm-link/Makefile.am +++ b/llvm/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/llvm/tools/llvm-nm/Makefile.am b/llvm/tools/llvm-nm/Makefile.am index 57f7650314e..d04c7607643 100644 --- a/llvm/tools/llvm-nm/Makefile.am +++ b/llvm/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/llvm/tools/llvm-prof/Makefile.am b/llvm/tools/llvm-prof/Makefile.am index 1e942d37bd2..2465361ec98 100644 --- a/llvm/tools/llvm-prof/Makefile.am +++ b/llvm/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/llvm/tools/llvm-stub/Makefile.am b/llvm/tools/llvm-stub/Makefile.am index e4c867d014f..aa5119cc6ca 100644 --- a/llvm/tools/llvm-stub/Makefile.am +++ b/llvm/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/llvm/tools/llvmc/Makefile.am b/llvm/tools/llvmc/Makefile.am index ac1b398fff0..125e041aea7 100644 --- a/llvm/tools/llvmc/Makefile.am +++ b/llvm/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/llvm/tools/opt/Makefile.am b/llvm/tools/opt/Makefile.am index 14cbaade0ef..9c37905ded4 100644 --- a/llvm/tools/opt/Makefile.am +++ b/llvm/tools/opt/Makefile.am @@ -7,7 +7,7 @@ # #===------------------------------------------------------------------------===# -include $(top_srcdir)/Makefile.rules.am +include $(top_srcdir)/Makefile_config bin_PROGRAMS = opt |
