9 files changed, 31 insertions, 33 deletions
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)