Temporarily Revert "Nuke the old JIT." as it's not quite ready to

[oota-llvm.git] / lib / ExecutionEngine / Makefile

diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile
index b97e4115ac06c0a71794d6d3981500bf4fd747be..c26e0ada5bc15ef71a5d3dd9785bbcc83aae34c6 100644 (file)
--- a/lib/ExecutionEngine/Makefile
+++ b/lib/ExecutionEngine/Makefile
@@ -1,14 +1,24 @@
+##===- lib/ExecutionEngine/Makefile ------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
 LEVEL = ../..
-TOOLNAME = lli
-PARALLEL_DIRS = Interpreter JIT
+LIBRARYNAME = LLVMExecutionEngine
 
-JITLIBS  = lli-jit codegen x86
-USEDLIBS = lli-interpreter $(JITLIBS) bcreader vmcore scalaropts.a \
-           analysis.a support.a target.a 
+include $(LEVEL)/Makefile.config
 
-# Have gcc tell the linker to export symbols from the program so that
-# dynamically loaded modules can be linked against them.
-#
-TOOLLINKOPTS = -ldl
+PARALLEL_DIRS = Interpreter JIT MCJIT RuntimeDyld
+
+ifeq ($(USE_INTEL_JITEVENTS), 1)
+PARALLEL_DIRS += IntelJITEvents
+endif
+
+ifeq ($(USE_OPROFILE), 1)
+PARALLEL_DIRS += OProfileJIT
+endif
 
-include $(LEVEL)/Makefile.common
+include $(LLVM_SRC_ROOT)/Makefile.rules