[vmkit-commits] [vmkit] r180408 - no more Makefile.config

Peter Senna Tschudin peter.senna at gmail.com
Thu Apr 25 10:08:38 PDT 2013 

Author: peter.senna
Date: Thu Apr 25 12:07:05 2013
New Revision: 180408

URL: http://llvm.org/viewvc/llvm-project?rev=180408&view=rev
Log:
no more Makefile.config
(cherry picked from commit 27fc045a45eaaa2fa44718fcf90c25b0c4ff4814)

Removed:
    vmkit/trunk/Makefile.config.in
Modified:
    vmkit/trunk/Makefile
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure
    vmkit/trunk/lib/Makefile
    vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile
    vmkit/trunk/lib/j3/ClassLib/Makefile
    vmkit/trunk/lib/j3/Compiler/Makefile
    vmkit/trunk/lib/j3/LLVMRuntime/Makefile
    vmkit/trunk/lib/j3/Makefile
    vmkit/trunk/lib/j3/VMCore/Makefile
    vmkit/trunk/lib/prepare-code/Makefile
    vmkit/trunk/lib/vmkit/CommonThread/Makefile
    vmkit/trunk/lib/vmkit/Compiler/Makefile
    vmkit/trunk/lib/vmkit/JITGCPass/Makefile
    vmkit/trunk/lib/vmkit/MMTk/Makefile
    vmkit/trunk/lib/vmkit/Makefile
    vmkit/trunk/lib/vmkit/Runtime/Makefile
    vmkit/trunk/mmtk/Makefile
    vmkit/trunk/mmtk/inline/Makefile
    vmkit/trunk/mmtk/java/Makefile
    vmkit/trunk/mmtk/magic/Makefile
    vmkit/trunk/mmtk/mmtk-alloc/Makefile
    vmkit/trunk/mmtk/mmtk-j3/Makefile
    vmkit/trunk/tools/Makefile
    vmkit/trunk/tools/j3/Makefile
    vmkit/trunk/tools/llcj/Makefile
    vmkit/trunk/tools/precompiler/Makefile
    vmkit/trunk/tools/trainer/Makefile
    vmkit/trunk/tools/vmjc/Makefile

Modified: vmkit/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/Makefile (original)
+++ vmkit/trunk/Makefile Thu Apr 25 12:07:05 2013
@@ -9,21 +9,6 @@
 
 LEVEL := .
 
-include $(LEVEL)/Makefile.config
-
-# Top-Level vmkit Build Stages:
-#
 DIRS := lib/prepare-code lib tools/vmjc mmtk tools/precompiler tools/trainer tools
 
-EXTRA_DIST=include
-
 include $(LEVEL)/Makefile.common
-
-#------------------------------------------------------------------------
-# Make sure the generated headers are up-to-date. This must be kept in
-# sync with the AC_CONFIG_HEADER invocations in autoconf/configure.ac
-#------------------------------------------------------------------------
-FilesToConfig := \
-  include/llvm/Config/config.h \
-  lib/j3/Classpath/Classpath.h \
-FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))

Removed: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=180407&view=auto
==============================================================================
    (empty)

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Thu Apr 25 12:07:05 2013
@@ -434,7 +434,6 @@ AC_CONFIG_SRCDIR(["Makefile.common.in"])
 
 dnl Configure a common Makefile
 AC_CONFIG_FILES(Makefile.common)
-AC_CONFIG_FILES(Makefile.config)
 AC_CONFIG_FILES([lib/j3/ClassLib/Classpath.h])
 AC_CONFIG_FILES([tools/llcj/LinkPaths.h])
 AC_CONFIG_FILES([mmtk/java/src/org/j3/config/Selected.java])

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Thu Apr 25 12:07:05 2013
@@ -5962,8 +5962,6 @@ ac_config_headers="$ac_config_headers in
 
 ac_config_files="$ac_config_files Makefile.common"
 
-ac_config_files="$ac_config_files Makefile.config"
-
 ac_config_files="$ac_config_files lib/j3/ClassLib/Classpath.h"
 
 ac_config_files="$ac_config_files tools/llcj/LinkPaths.h"
@@ -6694,7 +6692,6 @@ do
     "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
     "include/vmkit/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/vmkit/config.h" ;;
     "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
-    "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
     "lib/j3/ClassLib/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/j3/ClassLib/Classpath.h" ;;
     "tools/llcj/LinkPaths.h") CONFIG_FILES="$CONFIG_FILES tools/llcj/LinkPaths.h" ;;
     "mmtk/java/src/org/j3/config/Selected.java") CONFIG_FILES="$CONFIG_FILES mmtk/java/src/org/j3/config/Selected.java" ;;

Modified: vmkit/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/Makefile (original)
+++ vmkit/trunk/lib/Makefile Thu Apr 25 12:07:05 2013
@@ -10,7 +10,5 @@ LEVEL = ..
 
 DIRS=vmkit j3
 
-include $(LEVEL)/Makefile.config
-
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile Thu Apr 25 12:07:05 2013
@@ -8,8 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../../..
 
-include $(LEVEL)/Makefile.config
-
 MODULE_WITH_GC=Classpath
 INCLUDES+=-I$(PROJ_SRC_ROOT)/lib/j3/VMCore -I$(PROJ_SRC_ROOT)/lib/j3/ClassLib
 

Modified: vmkit/trunk/lib/j3/ClassLib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/Makefile (original)
+++ vmkit/trunk/lib/j3/ClassLib/Makefile Thu Apr 25 12:07:05 2013
@@ -8,18 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-EXTRA_DIST = ArrayCopy.inc \
-             ClassContext.inc \
-             ClasspathConstructor.inc \
-             ClasspathField.inc \
-             ClasspathMethod.inc \
-             DefineClass.inc \
-             Reflect.inc \
-             SetProperties.inc \
-             Unsafe.inc
-
-include $(LEVEL)/Makefile.config
-
 DIRS = $(CLASSPATH_DIR)
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/j3/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/Makefile (original)
+++ vmkit/trunk/lib/j3/Compiler/Makefile Thu Apr 25 12:07:05 2013
@@ -8,9 +8,10 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-include $(LEVEL)/Makefile.config
-
 MODULE_WITH_GC = J3Compiler
-INCLUDES+=-I$(PROJ_SRC_ROOT)/lib/j3/ClassLib/$(CLASSPATH_DIR) -I$(PROJ_SRC_ROOT)/lib/j3/ClassLib -I$(PROJ_SRC_ROOT)/lib/j3/VMCore -I$(PROJ_SRC_ROOT)/lib/j3/LLVMRuntime
+INCLUDES+=-I$(PROJ_SRC_ROOT)/lib/j3/ClassLib/$(CLASSPATH_DIR) \
+					-I$(PROJ_SRC_ROOT)/lib/j3/ClassLib \
+					-I$(PROJ_SRC_ROOT)/lib/j3/VMCore \
+					-I$(PROJ_SRC_ROOT)/lib/j3/LLVMRuntime/$(BUILD_NAME)
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/j3/LLVMRuntime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/LLVMRuntime/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/LLVMRuntime/Makefile (original)
+++ vmkit/trunk/lib/j3/LLVMRuntime/Makefile Thu Apr 25 12:07:05 2013
@@ -8,8 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-include $(LEVEL)/Makefile.config
-
 VMKIT_RUNTIME_IN=runtime-default.ll runtime-mmtk-thread.ll runtime-single.ll
 VMKIT_RUNTIME_OUT=LLVMRuntime.inc
 

Modified: vmkit/trunk/lib/j3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Makefile (original)
+++ vmkit/trunk/lib/j3/Makefile Thu Apr 25 12:07:05 2013
@@ -10,6 +10,5 @@ LEVEL = ../..
 
 DIRS = LLVMRuntime VMCore ClassLib Compiler
 
-include $(LEVEL)/Makefile.config
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/lib/j3/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Makefile (original)
+++ vmkit/trunk/lib/j3/VMCore/Makefile Thu Apr 25 12:07:05 2013
@@ -8,10 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-EXTRA_DIST = JniClasspath.inc JniOpenJDK.inc
-
-include $(LEVEL)/Makefile.config
-
 MODULE_WITH_GC = J3
 INCLUDES+=-I$(PROJ_SRC_ROOT)/lib/j3/ClassLib/$(CLASSPATH_DIR) -I$(PROJ_SRC_ROOT)/lib/j3/ClassLib
 

Modified: vmkit/trunk/lib/prepare-code/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/prepare-code/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/prepare-code/Makefile (original)
+++ vmkit/trunk/lib/prepare-code/Makefile Thu Apr 25 12:07:05 2013
@@ -9,8 +9,6 @@
 
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 LIBRARY=prepare-code
 LOADABLE_MODULE = 1
 

Modified: vmkit/trunk/lib/vmkit/CommonThread/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/CommonThread/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/CommonThread/Makefile (original)
+++ vmkit/trunk/lib/vmkit/CommonThread/Makefile Thu Apr 25 12:07:05 2013
@@ -8,10 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-EXTRA_DIST = Sigsegv-linux-x64.inc Sigsegv-macos-x64.inc Sigsegv-linux-x86.inc
-
-include $(LEVEL)/Makefile.config
-
 MODULE_WITH_GC = CommonThread
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/vmkit/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/Makefile (original)
+++ vmkit/trunk/lib/vmkit/Compiler/Makefile Thu Apr 25 12:07:05 2013
@@ -8,8 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-include $(LEVEL)/Makefile.config
-
 MODULE_WITH_GC = VmkitCompiler
 
 VMKIT_RUNTIME_IN=LLVMRuntime.ll

Modified: vmkit/trunk/lib/vmkit/JITGCPass/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/JITGCPass/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/JITGCPass/Makefile (original)
+++ vmkit/trunk/lib/vmkit/JITGCPass/Makefile Thu Apr 25 12:07:05 2013
@@ -9,10 +9,7 @@
 
 LEVEL = ../../..
 
-include $(LEVEL)/Makefile.config
-
 LIBRARY=JITGCPass
-LOADABLE_MODULE = 1
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/lib/vmkit/MMTk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/MMTk/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/MMTk/Makefile (original)
+++ vmkit/trunk/lib/vmkit/MMTk/Makefile Thu Apr 25 12:07:05 2013
@@ -8,8 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-include $(LEVEL)/Makefile.config
-
 MODULE_WITH_GC = MMTk
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/vmkit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Makefile (original)
+++ vmkit/trunk/lib/vmkit/Makefile Thu Apr 25 12:07:05 2013
@@ -8,8 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 DIRS = CommonThread MMTk Runtime Compiler JITGCPass
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/vmkit/Runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Runtime/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Runtime/Makefile (original)
+++ vmkit/trunk/lib/vmkit/Runtime/Makefile Thu Apr 25 12:07:05 2013
@@ -8,8 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-include $(LEVEL)/Makefile.config
-
 MODULE_WITH_GC = Vmkit
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/mmtk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/mmtk/Makefile (original)
+++ vmkit/trunk/mmtk/Makefile Thu Apr 25 12:07:05 2013
@@ -10,7 +10,5 @@ LEVEL = ..
 
 DIRS = magic mmtk-j3 mmtk-alloc java inline
 
-include $(LEVEL)/Makefile.config
-
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/mmtk/inline/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/inline/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/mmtk/inline/Makefile (original)
+++ vmkit/trunk/mmtk/inline/Makefile Thu Apr 25 12:07:05 2013
@@ -8,15 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 MODULE_WITH_GC = InlineMMTk
 
 include $(LEVEL)/Makefile.common
-
-# Use CompileCommonOpts instead of CXX.Flags to make sure the flag is added
-# after the -Wall added by LLVM.
-CompileCommonOpts += -Wno-unused-variable
-
-clean-local::
-	$(Verb) $(RM) -f *.inc

Modified: vmkit/trunk/mmtk/java/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/mmtk/java/Makefile (original)
+++ vmkit/trunk/mmtk/java/Makefile Thu Apr 25 12:07:05 2013
@@ -8,10 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 RUN_ANT = 1
 JARNAME = mmtk-vmkit
-EXTRA_DIST = vmkit.properties build.xml.in src
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/mmtk/magic/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/magic/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/mmtk/magic/Makefile (original)
+++ vmkit/trunk/mmtk/magic/Makefile Thu Apr 25 12:07:05 2013
@@ -9,10 +9,7 @@
 
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 LIBRARY=MMTKMagic
-LOADABLE_MODULE = 1
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/mmtk/mmtk-alloc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Makefile Thu Apr 25 12:07:05 2013
@@ -9,12 +9,8 @@
 
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 MODULE=MMTKAlloc
 NEED_BC=1
 
-CXX.Flags += -I$(PROJ_SRC_DIR)/../../lib/j3/VMCore
-
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/mmtk/mmtk-j3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Makefile Thu Apr 25 12:07:05 2013
@@ -9,12 +9,8 @@
 
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 LIBRARY=MMTKRuntime
 NEED_BC=1
 
-CXX.Flags += -I$(PROJ_SRC_DIR)/../../lib/j3/VMCore
-
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/tools/Makefile (original)
+++ vmkit/trunk/tools/Makefile Thu Apr 25 12:07:05 2013
@@ -8,8 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ..
 
-include $(LEVEL)/Makefile.config
-
 DIRS=j3 vmjc llcj
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/tools/j3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/tools/j3/Makefile (original)
+++ vmkit/trunk/tools/j3/Makefile Thu Apr 25 12:07:05 2013
@@ -8,11 +8,8 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 TOOL=j3
 USE=Classpath J3 J3Compiler Vmkit VmkitCompiler CommonThread FinalMMTk InlineMMTk Precompiled BootstrapClasses
 BUILD_FRAMETABLE = 1
-LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/tools/llcj/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/llcj/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/tools/llcj/Makefile (original)
+++ vmkit/trunk/tools/llcj/Makefile Thu Apr 25 12:07:05 2013
@@ -8,9 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 TOOL=llcj
-LINK_COMPONENTS = support
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/tools/precompiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/Makefile (original)
+++ vmkit/trunk/tools/precompiler/Makefile Thu Apr 25 12:07:05 2013
@@ -8,11 +8,8 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
 TOOL=precompiler
 USE=Classpath J3 J3Compiler Vmkit VmkitCompiler CommonThread FinalMMTk
 BUILD_FRAMETABLE=1
-LINK_COMPONENTS=jit nativecodegen scalaropts instrumentation ipa ipo asmparser linker bitwriter
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/tools/trainer/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/trainer/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/tools/trainer/Makefile (original)
+++ vmkit/trunk/tools/trainer/Makefile Thu Apr 25 12:07:05 2013
@@ -8,10 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-EXTRA_DIST = HelloWorld.java
-
-include $(LEVEL)/Makefile.config
-
 all:: Precompiled.bc BootstrapClasses.bc
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/tools/vmjc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/Makefile?rev=180408&r1=180407&r2=180408&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/Makefile (original)
+++ vmkit/trunk/tools/vmjc/Makefile Thu Apr 25 12:07:05 2013
@@ -8,12 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
-
-EXTRA_DIST = libvmjc
-
 TOOL=vmjc
 USE=J3 Classpath J3Compiler Vmkit VmkitCompiler MMTk CommonThread
-LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo bitwriter
 
 include $(LEVEL)/Makefile.common

More information about the vmkit-commits mailing list