X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Flli%2FMakefile;h=100fc2e415aae7af6e53c1cae7230b1c2829b9d9;hb=b21d9aebba7e45ddcbce61dd501000049cefb335;hp=da98f66116f44e59340df1c72c91b85c87bd10c9;hpb=f25b7729c11bb1abe7e26fb0510cb3ed766358fc;p=oota-llvm.git

diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index da98f66116f..100fc2e415a 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -1,34 +1,29 @@
-LEVEL = ../..
-TOOLNAME = lli
-PARALLEL_DIRS = Interpreter JIT
-
-# Get the config name...
-include $(LEVEL)/Makefile.$(shell uname)
-
-# Generic JIT libraries
-JITLIBS   = lli-jit codegen
-ARCHLIBS  =
+##===- tools/lli/Makefile ------------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
 
-# What the X86 JIT requires
-JITLIBS  += x86
-# X86 doesn't require any ARCHLIBS
+LEVEL := ../..
+TOOLNAME := lli
 
+include $(LEVEL)/Makefile.config
 
+LINK_COMPONENTS := mcjit jit interpreter nativecodegen bitreader asmparser selectiondag
 
-# What the Sparc JIT requires
-ifeq ($(ARCH),Sparc)
-JITLIBS  += sparc 
-ARCHLIBS  = sched livevar instrument.a profpaths \
-           bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
-           mapping select postopts.a preopts
+# If Intel JIT Events support is confiured, link against the LLVM Intel JIT
+# Events interface library
+ifeq ($(USE_INTEL_JITEVENTS), 1)
+  LINK_COMPONENTS += inteljitevents
 endif
 
-USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \
-           transformutils.a bcreader vmcore support.a target.a
-
-# Have gcc tell the linker to export symbols from the program so that
-# dynamically loaded modules can be linked against them.
-#
-TOOLLINKOPTS = -ldl
+# If oprofile support is confiured, link against the LLVM oprofile interface
+# library
+ifeq ($(USE_OPROFILE), 1)
+  LINK_COMPONENTS += oprofilejit
+endif
 
-include $(LEVEL)/Makefile.common
+include $(LLVM_SRC_ROOT)/Makefile.rules