X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Flli%2FMakefile;h=80aa82b4d68132cb1444330e006e65d0f6a00407;hb=adf01b3f18442ae8db6b8948e70d82d9df415119;hp=1c64b6933d82896ca8b7e67cd0a52a662bd8bf91;hpb=d1cab3e6ce508e593b17fdd660ed8cc4ea486d72;p=oota-llvm.git

diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 1c64b6933d8..80aa82b4d68 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -1,49 +1,15 @@
-LEVEL = ../..
-TOOLNAME = lli
-
-# Get the $(ARCH) setting
-include $(LEVEL)/Makefile.config
-
-# Generic JIT libraries
-JITLIBS   = lli-jit codegen executionengine
-ARCHLIBS  =
-
-# You can enable the X86 JIT on a non-X86 host by setting the flag
-# ENABLE_X86_JIT on the make command line. If not, it will still be
-# enabled automagically on an X86 host.
-ifeq ($(ARCH), x86)
-  ENABLE_X86_JIT = 1
-endif
-
-# What the X86 JIT requires
-ifdef ENABLE_X86_JIT
-  CPPFLAGS += -DENABLE_X86_JIT
-  JITLIBS  += x86 selectiondag
-  # X86 doesn't require any ARCHLIBS
-endif
-
-# You can enable the Sparc JIT on a non-Sparc host by setting the flag
-# ENABLE_SPARC_JIT on the make command line. If not, it will still be
-# enabled automagically on an Sparc host.
-ifeq ($(ARCH), Sparc)
-  ENABLE_SPARC_JIT = 1
-endif
-
-# What the Sparc JIT requires
-ifdef ENABLE_SPARC_JIT
-  CPPFLAGS += -DENABLE_SPARC_JIT
-  JITLIBS  += sparc 
-  ARCHLIBS += sched livevar instrument.a profpaths \
-              bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
-              select
-endif
-
-USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \
-           transformutils.a bcreader vmcore support target.a
-
-# Have gcc tell the linker to export symbols from the program so that
-# dynamically loaded modules can be linked against them.
+##===- tools/lli/Makefile ------------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
 #
-TOOLLINKOPTS = $(PLATFORMLIBDL)
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LEVEL    := ../..
+TOOLNAME := lli
+LINK_COMPONENTS := mcjit jit interpreter nativecodegen bitreader asmparser selectiondag
 
+# Enable JIT support
 include $(LEVEL)/Makefile.common