[vmkit-commits] [vmkit] r180393 - rename TOOLNAME and LIBRARYNAME into TOOL and LIBRARY

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

Author: peter.senna
Date: Thu Apr 25 12:05:19 2013
New Revision: 180393

URL: http://llvm.org/viewvc/llvm-project?rev=180393&view=rev
Log:
rename TOOLNAME and LIBRARYNAME into TOOL and LIBRARY
(cherry picked from commit 5f5ad2784adce0f00b4b7f17781a6f7f1ca59298)

Modified:
    vmkit/trunk/Makefile
    vmkit/trunk/Makefile.rules
    vmkit/trunk/lib/vmkit/JITGCPass/Makefile
    vmkit/trunk/lib/vmkit/StaticGCPass/Makefile
    vmkit/trunk/lib/vmkit/StaticGCPrinter/Makefile
    vmkit/trunk/mmtk/magic/Makefile
    vmkit/trunk/mmtk/mmtk-j3/Makefile
    vmkit/trunk/tools/j3/Makefile
    vmkit/trunk/tools/llcj/Makefile
    vmkit/trunk/tools/precompiler/Makefile
    vmkit/trunk/tools/vmjc/Makefile
    vmkit/trunk/tools/vmjc/libvmjc/Makefile

Modified: vmkit/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/Makefile (original)
+++ vmkit/trunk/Makefile Thu Apr 25 12:05:19 2013
@@ -13,7 +13,7 @@ include $(LEVEL)/Makefile.config
 
 # Top-Level vmkit Build Stages:
 #
-DIRS := lib/vmkit/StaticGCPass lib/vmkit/StaticGCPrinter lib tools/vmjc mmtk tools/precompiler tools/trainer tools
+DIRS := lib/prepare-code lib/vmkit/StaticGCPass lib/vmkit/StaticGCPrinter lib tools/vmjc mmtk tools/precompiler tools/trainer tools
 
 EXTRA_DIST=include
 

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:05:19 2013
@@ -77,18 +77,18 @@ endif
 ###############################################################################
 USEDLIBS:=$(patsubst %,$(LibDir)/lib%,$(USEDLIBS))
 
-ifdef TOOLNAME
-all:: $(BINDIR)/$(TOOLNAME)$(EXEEXT)
+ifdef TOOL
+all:: $(BINDIR)/$(TOOL)$(EXEEXT)
 
-$(BINDIR)/$(TOOLNAME)$(EXEEXT): $(ObjectsO) $(USEDLIBS) $(SELF) $(BINDIR)/.dir
+$(BINDIR)/$(TOOL)$(EXEEXT): $(ObjectsO) $(USEDLIBS) $(SELF) $(BINDIR)/.dir
 	$(Echo) 'Linking executable $(notdir $@)'
 	$(Verb) $(CLANGXX) -o $@ $(ObjectsO) $(USEDLIBS) $(MY_LIBS) $(MY_LDFLAGS) 
 endif
 
-ifdef LIBRARYNAME
-all:: $(LIBDIR)/$(LIBRARYNAME)$(SHLIBEXT)
+ifdef LIBRARY
+all:: $(LIBDIR)/$(LIBRARY)$(SHLIBEXT)
 
-$(LIBDIR)/$(LIBRARYNAME)$(SHLIBEXT): $(ObjectsO) $(SELF) $(LIBDIR)/.dir
+$(LIBDIR)/$(LIBRARY)$(SHLIBEXT): $(ObjectsO) $(SELF) $(LIBDIR)/.dir
 	$(Echo) "Linking shared library $(notdir $@)"
 	$(Verb) $(CLANGXX) -O0 -o $@ $(SHOPT) -Wl,-R -Wl,'$ORIGIN' -shared $(ObjectsO)
 endif

Modified: vmkit/trunk/lib/vmkit/JITGCPass/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/JITGCPass/Makefile?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/JITGCPass/Makefile (original)
+++ vmkit/trunk/lib/vmkit/JITGCPass/Makefile Thu Apr 25 12:05:19 2013
@@ -11,7 +11,7 @@ LEVEL = ../../..
 
 include $(LEVEL)/Makefile.config
 
-LIBRARYNAME = JITGCPass
+LIBRARY=JITGCPass
 LOADABLE_MODULE = 1
 USEDLIBS =
 

Modified: vmkit/trunk/lib/vmkit/StaticGCPass/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/StaticGCPass/Makefile?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/StaticGCPass/Makefile (original)
+++ vmkit/trunk/lib/vmkit/StaticGCPass/Makefile Thu Apr 25 12:05:19 2013
@@ -11,7 +11,7 @@ LEVEL = ../../..
 
 include $(LEVEL)/Makefile.config
 
-LIBRARYNAME = StaticGCPass
+LIBRARY=StaticGCPass
 LOADABLE_MODULE = 1
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/vmkit/StaticGCPrinter/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/StaticGCPrinter/Makefile?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/StaticGCPrinter/Makefile (original)
+++ vmkit/trunk/lib/vmkit/StaticGCPrinter/Makefile Thu Apr 25 12:05:19 2013
@@ -11,7 +11,7 @@ LEVEL = ../../..
 
 include $(LEVEL)/Makefile.config
 
-LIBRARYNAME = StaticGCPrinter
+LIBRARY=StaticGCPrinter
 LOADABLE_MODULE = 1
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/mmtk/magic/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/magic/Makefile?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/mmtk/magic/Makefile (original)
+++ vmkit/trunk/mmtk/magic/Makefile Thu Apr 25 12:05:19 2013
@@ -11,7 +11,7 @@ LEVEL = ../..
 
 include $(LEVEL)/Makefile.config
 
-LIBRARYNAME = MMTKMagic
+LIBRARY=MMTKMagic
 LOADABLE_MODULE = 1
 
 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=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Makefile Thu Apr 25 12:05:19 2013
@@ -12,7 +12,7 @@ LEVEL = ../..
 include $(LEVEL)/Makefile.config
 
 MODULE_NAME = MMTKRuntime
-LIBRARYNAME = MMTKRuntime
+LIBRARY=MMTKRuntime
 LOADABLE_MODULE = 1
 
 CXX.Flags += -I$(PROJ_SRC_DIR)/../../lib/j3/VMCore

Modified: vmkit/trunk/tools/j3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Makefile?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/tools/j3/Makefile (original)
+++ vmkit/trunk/tools/j3/Makefile Thu Apr 25 12:05:19 2013
@@ -10,7 +10,7 @@ LEVEL = ../..
 
 include $(LEVEL)/Makefile.config
 
-TOOLNAME = j3
+TOOL=j3
 USEDLIBS = Classpath.a J3.a J3Compiler.a Vmkit.a VmkitCompiler.a CommonThread.a FinalMMTk.a InlineMMTk.a Precompiled.a BootstrapClasses.a Classpath.a J3.a J3Compiler.a Vmkit.a VmkitCompiler.a CommonThread.a FinalMMTk.a InlineMMTk.a Precompiled.a BootstrapClasses.a
 BUILD_FRAMETABLE = 1
 LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo

Modified: vmkit/trunk/tools/llcj/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/llcj/Makefile?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/tools/llcj/Makefile (original)
+++ vmkit/trunk/tools/llcj/Makefile Thu Apr 25 12:05:19 2013
@@ -10,7 +10,7 @@ LEVEL = ../..
 
 include $(LEVEL)/Makefile.config
 
-TOOLNAME = llcj
+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=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/Makefile (original)
+++ vmkit/trunk/tools/precompiler/Makefile Thu Apr 25 12:05:19 2013
@@ -10,7 +10,7 @@ LEVEL = ../..
 
 include $(LEVEL)/Makefile.config
 
-TOOLNAME = precompiler
+TOOL=precompiler
 USEDLIBS = Classpath.a J3.a J3Compiler.a Vmkit.a VmkitCompiler.a CommonThread.a FinalMMTk.a Classpath.a J3.a J3Compiler.a Vmkit.a VmkitCompiler.a CommonThread.a FinalMMTk.a
 BUILD_FRAMETABLE = 1
 LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo asmparser linker bitwriter

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

Modified: vmkit/trunk/tools/vmjc/libvmjc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/libvmjc/Makefile?rev=180393&r1=180392&r2=180393&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/libvmjc/Makefile (original)
+++ vmkit/trunk/tools/vmjc/libvmjc/Makefile Thu Apr 25 12:05:19 2013
@@ -10,7 +10,7 @@ LEVEL = ../../..
 
 include $(LEVEL)/Makefile.config
 
-LIBRARYNAME = libvmjc
+LIBRARY=libvmjc
 LOADABLE_MODULE = 1
 VMJC_ASSEMBLY = 1
 BUILT_SOURCES = glibj.zip.s

More information about the vmkit-commits mailing list