3 files changed, 9 insertions, 13 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