[vmkit-commits] [vmkit] r144082 - in /vmkit/trunk: Makefile.common.in Makefile.config.in lib/Mvm/JITGCPass/Makefile lib/Mvm/StaticGCPass/Makefile lib/Mvm/StaticGCPrinter/Makefile mmtk/magic/Makefile

[Gael Thomas]

Author: gthomas
Date: Tue Nov  8 07:59:52 2011
New Revision: 144082

URL: http://llvm.org/viewvc/llvm-project?rev=144082&view=rev
Log:
can use Makefile.common from a foreign project

Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/Makefile.config.in
    vmkit/trunk/lib/Mvm/JITGCPass/Makefile
    vmkit/trunk/lib/Mvm/StaticGCPass/Makefile
    vmkit/trunk/lib/Mvm/StaticGCPrinter/Makefile
    vmkit/trunk/mmtk/magic/Makefile

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=144082&r1=144081&r2=144082&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Tue Nov  8 07:59:52 2011
@@ -1,6 +1,3 @@
-# Set the name of the project here
-PROJECT_NAME := @PACKAGE_NAME@
-PROJ_VERSION := @PACKAGE_VERSION@
  
 # Set this variable to the top of the LLVM source tree.
 LLVM_SRC_ROOT = @LLVM_SRC@
@@ -9,15 +6,6 @@
 # (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config).
 LLVM_OBJ_ROOT = @LLVM_OBJ@
 
-# Set the directory root of this project's source files
-PROJ_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
-
-# Set the root directory of this project's object files
-PROJ_OBJ_ROOT := $(subst //,/, at abs_top_objdir@)
-
-# Set the root directory of this project's install prefix
-PROJ_INSTALL_ROOT := @prefix@
-
 # Define BYTECODE_LIBRARY before including LLVM's Makefile.common to get
 # dependencies right.
 BYTECODE_LIBRARY = 1
@@ -29,7 +17,6 @@
   BUILT_SOURCES = FrametablesSymbols.inc FrametablesExterns.inc
 endif
   
-
 # Include LLVM's Master Makefile.
 include $(LLVM_OBJ_ROOT)/Makefile.common
 
@@ -47,4 +34,4 @@
 
 LIBS += -lz
 
-include $(PROJ_SRC_ROOT)/Makefile.rules
+include $(VMKIT_SRC_ROOT)/Makefile.rules

Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=144082&r1=144081&r2=144082&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Tue Nov  8 07:59:52 2011
@@ -1,3 +1,17 @@
+# Set the name of the project here
+PROJECT_NAME := @PACKAGE_NAME@
+PROJ_VERSION := @PACKAGE_VERSION@
+
+# Set the directory root of this project's source files
+PROJ_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
+VMKIT_SRC_ROOT := $(PROJ_SRC_ROOT)
+
+# Set the root directory of this project's object files
+PROJ_OBJ_ROOT := $(subst //,/, at abs_top_objdir@)
+
+# Set the root directory of this project's install prefix
+PROJ_INSTALL_ROOT := @prefix@
+
 MMTK_PLAN = @MMTK_PLAN@
 MMTK_PLAN_HEADER = @MMTK_PLAN_HEADER@
 WITH_64 = @WITH_64@

Modified: vmkit/trunk/lib/Mvm/JITGCPass/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/JITGCPass/Makefile?rev=144082&r1=144081&r2=144082&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/JITGCPass/Makefile (original)
+++ vmkit/trunk/lib/Mvm/JITGCPass/Makefile Tue Nov  8 07:59:52 2011
@@ -8,6 +8,9 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
+
+include $(LEVEL)/Makefile.config
+
 LIBRARYNAME = JITGCPass
 LOADABLE_MODULE = 1
 USEDLIBS =

Modified: vmkit/trunk/lib/Mvm/StaticGCPass/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/StaticGCPass/Makefile?rev=144082&r1=144081&r2=144082&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/StaticGCPass/Makefile (original)
+++ vmkit/trunk/lib/Mvm/StaticGCPass/Makefile Tue Nov  8 07:59:52 2011
@@ -8,6 +8,9 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
+
+include $(LEVEL)/Makefile.config
+
 LIBRARYNAME = StaticGCPass
 LOADABLE_MODULE = 1
 

Modified: vmkit/trunk/lib/Mvm/StaticGCPrinter/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/StaticGCPrinter/Makefile?rev=144082&r1=144081&r2=144082&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/StaticGCPrinter/Makefile (original)
+++ vmkit/trunk/lib/Mvm/StaticGCPrinter/Makefile Tue Nov  8 07:59:52 2011
@@ -8,6 +8,9 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
+
+include $(LEVEL)/Makefile.config
+
 LIBRARYNAME = StaticGCPrinter
 LOADABLE_MODULE = 1
 

Modified: vmkit/trunk/mmtk/magic/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/magic/Makefile?rev=144082&r1=144081&r2=144082&view=diff
==============================================================================
--- vmkit/trunk/mmtk/magic/Makefile (original)
+++ vmkit/trunk/mmtk/magic/Makefile Tue Nov  8 07:59:52 2011
@@ -8,6 +8,9 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
+
+include $(LEVEL)/Makefile.config
+
 LIBRARYNAME = MMTKMagic
 LOADABLE_MODULE = 1