3 files changed, 14 insertions, 12 deletions
diff --git a/lib/ExecutionEngine/Interpreter/Makefile.am b/lib/ExecutionEngine/Interpreter/Makefile.am
index 650807f609..420de6aa6f 100644
--- 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 eb9c589835..a0198d2327 100644
--- 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 a4e233923e..ada3bc851f 100644
--- 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