Update to reflect changes in Makefile rules.

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

7 files changed, 21 insertions, 28 deletions

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