[vmkit-commits] [vmkit] r57504 - in /vmkit/trunk: Makefile.common.in lib/JnJVM/Classpath/Makefile lib/JnJVM/LLVMRuntime/Makefile lib/JnJVM/VMCore/Makefile lib/Mvm/GCMmap2/Makefile lib/Mvm/Runtime/Makefile lib/N3/LLVMRuntime/Makefile lib/N3/Mono/Makefile lib/N3/PNetLib/Makefile lib/N3/VMCore/Makefile

Tue Oct 14 10:05:34 PDT 2008

Author: geoffray
Date: Tue Oct 14 12:05:34 2008
New Revision: 57504

URL: http://llvm.org/viewvc/llvm-project?rev=57504&view=rev
Log:
Use PROJ_SRC_DIR instead of PROJ_SRC_ROOT


Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/lib/JnJVM/Classpath/Makefile
    vmkit/trunk/lib/JnJVM/LLVMRuntime/Makefile
    vmkit/trunk/lib/JnJVM/VMCore/Makefile
    vmkit/trunk/lib/Mvm/GCMmap2/Makefile
    vmkit/trunk/lib/Mvm/Runtime/Makefile
    vmkit/trunk/lib/N3/LLVMRuntime/Makefile
    vmkit/trunk/lib/N3/Mono/Makefile
    vmkit/trunk/lib/N3/PNetLib/Makefile
    vmkit/trunk/lib/N3/VMCore/Makefile

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================

--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Tue Oct 14 12:05:34 2008
@@ -1,6 +1,6 @@
 # Set the name of the project here
-PROJECT_NAME := vmkit
-PROJ_VERSION := 0.1
+PROJECT_NAME := @PACKAGE_NAME@
+PROJ_VERSION := @PACKAGE_VERSION@
  
 # Set this variable to the top of the LLVM source tree.
 LLVM_SRC_ROOT = @LLVM_SRC@

Modified: vmkit/trunk/lib/JnJVM/Classpath/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/Makefile (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/Makefile Tue Oct 14 12:05:34 2008
@@ -13,8 +13,8 @@
 include $(LEVEL)/Makefile.config
 include $(LEVEL)/Makefile.common
 
-CXX.Flags += -I../VMCore $(CLASSPATH_FLAGS)
+CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore $(CLASSPATH_FLAGS)
 
 ifeq ($(ISOLATE_BUILD), 1)
-  CXX.Flags += -I../Isolate
+  CXX.Flags += -I$(PROJ_SRC_DIR)/../Isolate
 endif

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/Makefile (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/Makefile Tue Oct 14 12:05:34 2008
@@ -10,23 +10,23 @@
 
 include $(LEVEL)/Makefile.config
 
-VMKIT_RUNTIME = runtime-default.ll
+VMKIT_RUNTIME = $(PROJ_SRC_DIR)/runtime-default.ll
 
 ifeq ($(ISOLATE_BUILD), 1)
-VMKIT_RUNTIME += runtime-isolate.ll
+VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-isolate.ll
 endif
 
 ifeq ($(SERVICE_BUILD), 1)
-VMKIT_RUNTIME += runtime-service.ll runtime-isolate.ll runtime-multi-mmap.ll
+VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-service.ll $(PROJ_SRC_DIR)/runtime-isolate.ll $(PROJ_SRC_DIR)/runtime-multi-mmap.ll
 else
 ifeq ($(GC_MULTI_MMAP), 1)
-VMKIT_RUNTIME += runtime-multi-mmap.ll
+VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-multi-mmap.ll
 else
 ifeq ($(GC_SINGLE_MMAP), 1)
-VMKIT_RUNTIME += runtime-single-mmap.ll
+VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-single-mmap.ll
 else
 ifeq ($(GC_BOEHM), 1)
-VMKIT_RUNTIME += runtime-boehm.ll
+VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-boehm.ll
 endif
 endif
 endif

Modified: vmkit/trunk/lib/JnJVM/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Makefile (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Makefile Tue Oct 14 12:05:34 2008
@@ -14,8 +14,8 @@
 
 include $(LEVEL)/Makefile.common
 
-CXX.Flags += -I../LLVMRuntime $(CLASSPATH_FLAGS)
+CXX.Flags += -I$(PROJ_SRC_DIR)/../LLVMRuntime $(CLASSPATH_FLAGS)
 
 ifeq ($(ISOLATE_BUILD), 1)
-  CXX.Flags += -I../Isolate
+  CXX.Flags += -I$(PROJ_SRC_DIR)/../Isolate
 endif

Modified: vmkit/trunk/lib/Mvm/GCMmap2/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/Makefile (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/Makefile Tue Oct 14 12:05:34 2008
@@ -11,4 +11,4 @@
 LIBRARYNAME = GCMmap2
 include $(LEVEL)/Makefile.common
 
-CXX.Flags += -I$(PROJ_SRC_ROOT)/lib/Mvm/CommonThread -I$(PROJ_SRC_ROOT)/lib/Mvm/Allocator
+CXX.Flags += -I$(PROJ_SRC_DIR)/../CommonThread -I$(PROJ_SRC_DIR)/../Allocator

Modified: vmkit/trunk/lib/Mvm/Runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Makefile Tue Oct 14 12:05:34 2008
@@ -11,7 +11,7 @@
 include $(LEVEL)/Makefile.config
 
 LIBRARYNAME = Mvm
-VMKIT_RUNTIME = LLVMRuntime.ll
+VMKIT_RUNTIME = $(PROJ_SRC_DIR)/LLVMRuntime.ll
 BUILT_SOURCES = LLVMRuntime.inc
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/N3/LLVMRuntime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/LLVMRuntime/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/LLVMRuntime/Makefile (original)
+++ vmkit/trunk/lib/N3/LLVMRuntime/Makefile Tue Oct 14 12:05:34 2008
@@ -10,7 +10,7 @@
 
 include $(LEVEL)/Makefile.config
 
-VMKIT_RUNTIME = runtime.ll
+VMKIT_RUNTIME = $(PROJ_SRC_ROOT)/lib/N3/LLVMRuntime/runtime.ll
 BUILT_SOURCES = LLVMRuntime.inc
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/N3/Mono/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/Mono/Makefile (original)
+++ vmkit/trunk/lib/N3/Mono/Makefile Tue Oct 14 12:05:34 2008
@@ -10,7 +10,7 @@
 
 LIBRARYNAME = Mono
 include $(LEVEL)/Makefile.common
-CXX.Flags += -I../VMCore
+CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore
 
 CXX.Flags += `pkg-config --cflags glib-2.0 gthread-2.0`
 CXX.Flags += `pkg-config --cflags gmodule-2.0`

Modified: vmkit/trunk/lib/N3/PNetLib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/Makefile (original)
+++ vmkit/trunk/lib/N3/PNetLib/Makefile Tue Oct 14 12:05:34 2008
@@ -10,4 +10,4 @@
 
 LIBRARYNAME = PNetLib
 include $(LEVEL)/Makefile.common
-CXX.Flags += -I../VMCore
+CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore

Modified: vmkit/trunk/lib/N3/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/Makefile?rev=57504&r1=57503&r2=57504&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Makefile (original)
+++ vmkit/trunk/lib/N3/VMCore/Makefile Tue Oct 14 12:05:34 2008
@@ -1,4 +1,4 @@
-##===- lib/JnJVM/VMCore/Makefile ---------------------------*- Makefile -*-===##
+##===- lib/N3/VMCore/Makefile ------------------------------*- Makefile -*-===##
 # 
 #                     The vmkit project
 #
@@ -11,4 +11,4 @@
 LIBRARYNAME = N3
 include $(LEVEL)/Makefile.common
 
-CXX.Flags += -I../LLVMRuntime
+CXX.Flags += -I$(PROJ_SRC_DIR)/../LLVMRuntime



