[vmkit-commits] [vmkit] r81145 - in /vmkit/trunk: Makefile.rules tools/jnjvm/Makefile tools/n3-mono/Makefile tools/n3-pnetlib/Makefile tools/vmjc/Makefile tools/vmkit/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Mon Sep  7 02:33:49 2009
New Revision: 81145

URL: http://llvm.org/viewvc/llvm-project?rev=81145&view=rev
Log:
Update Makefiles for al tools.


Modified:
    vmkit/trunk/Makefile.rules
    vmkit/trunk/tools/jnjvm/Makefile
    vmkit/trunk/tools/n3-mono/Makefile
    vmkit/trunk/tools/n3-pnetlib/Makefile
    vmkit/trunk/tools/vmjc/Makefile
    vmkit/trunk/tools/vmkit/Makefile

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=81145&r1=81144&r2=81145&view=diff

==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Mon Sep  7 02:33:49 2009
@@ -99,26 +99,26 @@
 
 
 
-ifdef TOOLNAME
+ifdef MODULESNAME
 ifdef USEDMODULES
 
 ProjLibsPaths   := $(addprefix $(LibDir)/,$(USEDMODULES))
 
-$(TOOLNAME).bc : $(ProjLibsPaths)
+$(MODULESNAME).bc : $(ProjLibsPaths)
 	$(Echo) Building $(BuildMode) Bytecode Module $(notdir $@)
 	$(Verb) $(LLVMLD) -L$(CFERuntimeLibDir) -r -o $@ $(ProjLibsPaths)
 
-$(TOOLNAME).s : $(TOOLNAME).bc
+$(MODULESNAME).s : $(MODULESNAME).bc
 	$(Echo) Building $(BuildMode) Assembly file $(notdir $@)
-	$(Verb) $(LOPT) -load=$(LibDir)/StaticGCPass.so -std-compile-opts -StaticGCPass -f $(TOOLNAME).bc -o vmkitoptimized.bc
-	$(Verb) $(LLC) -disable-fp-elim -f vmkitoptimized.bc -o $(TOOLNAME).s
+	$(Verb) $(LOPT) -load=$(LibDir)/StaticGCPass.so -std-compile-opts -StaticGCPass -f $(MODULESNAME).bc -o vmkitoptimized.bc
+	$(Verb) $(LLC) -disable-fp-elim -f vmkitoptimized.bc -o $(MODULESNAME).s
 
 $(ObjDir)/%.o: %.s $(ObjDir)/.dir $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.s for $(BuildMode) build" $(PIC_FLAG)
 	$(Verb) $(Compile.C) $< -o $(ObjDir)/$*.o
 
 clean-local::
-	$(Verb) $(RM) -f vmkitoptimized.bc $(TOOLNAME).bc $(TOOLNAME).s
+	$(Verb) $(RM) -f vmkitoptimized.bc $(MODULESNAME).bc $(MODULESNAME).s
 
 endif
 endif

Modified: vmkit/trunk/tools/jnjvm/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/jnjvm/Makefile?rev=81145&r1=81144&r2=81145&view=diff

==============================================================================
--- vmkit/trunk/tools/jnjvm/Makefile (original)
+++ vmkit/trunk/tools/jnjvm/Makefile Mon Sep  7 02:33:49 2009
@@ -14,6 +14,7 @@
 
 ifeq ($(WITH_LLVM_GCC), 1)
 
+  MODULESNAME = jnjvm
   USEDMODULES = JnJVM.bc Classpath.bc JnjvmCompiler.bc Allocator.bc CommonThread.bc \
 		Mvm.bc MvmCompiler.bc $(GCLIB).bc
 

Modified: vmkit/trunk/tools/n3-mono/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/n3-mono/Makefile?rev=81145&r1=81144&r2=81145&view=diff

==============================================================================
--- vmkit/trunk/tools/n3-mono/Makefile (original)
+++ vmkit/trunk/tools/n3-mono/Makefile Mon Sep  7 02:33:49 2009
@@ -12,8 +12,19 @@
 
 TOOLNAME = n3-mono
 LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo
-USEDLIBS = N3.a Mono.a Allocator.a CommonThread.a Mvm.a MvmCompiler.a \
-	   $(GCLIB).a
+
+
+ifeq ($(WITH_LLVM_GCC), 1)
+  MODULESNAME = vmkit
+  USEDMODULES = N3.bc Mono.bc Allocator.bc CommonThread.bc Mvm.bc \
+		MvmCompiler.bc $(GCLIB).bc
+  BUILT_SOURCES = vmkit.s
+  SOURCES = vmkit.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+else
+
+  USEDLIBS = N3.a Mono.a Allocator.a CommonThread.a Mvm.a MvmCompiler.a \
+   	     $(GCLIB).a
+endif
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/tools/n3-pnetlib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/n3-pnetlib/Makefile?rev=81145&r1=81144&r2=81145&view=diff

==============================================================================
--- vmkit/trunk/tools/n3-pnetlib/Makefile (original)
+++ vmkit/trunk/tools/n3-pnetlib/Makefile Mon Sep  7 02:33:49 2009
@@ -12,8 +12,17 @@
 
 TOOLNAME = n3-pnetlib
 LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo
-USEDLIBS = N3.a PNetLib.a Allocator.a CommonThread.a Mvm.a MvmCompiler.a \
-	   $(GCLIB).a
+
+ifeq ($(WITH_LLVM_GCC), 1)
+  MODULESNAME = vmkit
+  USEDMODULES = N3.bc PNetLibc.bc Allocator.bc CommonThread.bc Mvm.bc \
+		MvmCompiler.bc $(GCLIB).bc
+  BUILT_SOURCES = vmkit.s
+  SOURCES = vmkit.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+else
+  USEDLIBS = N3.a PNetLib.a Allocator.a CommonThread.a Mvm.a MvmCompiler.a \
+   	     $(GCLIB).a
+endif
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/tools/vmjc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/Makefile?rev=81145&r1=81144&r2=81145&view=diff

==============================================================================
--- vmkit/trunk/tools/vmjc/Makefile (original)
+++ vmkit/trunk/tools/vmjc/Makefile Mon Sep  7 02:33:49 2009
@@ -13,8 +13,22 @@
 EXTRA_DIST = libvmjc
 
 TOOLNAME = vmjc
-USEDLIBS = JnJVM.a Classpath.a JnjvmCompiler.a Allocator.a CommonThread.a \
-	   Mvm.a MvmCompiler.a $(GCLIB).a
+
+
+ifeq ($(WITH_LLVM_GCC), 1)
+  MODULESNAME = vmkit
+  USEDMODULES = JnJVM.bc Classpath.bc JnjvmCompiler.bc Allocator.bc \
+		CommonThread.bc Mvm.bc MvmCompiler.bc $(GCLIB).bc
+
+  BUILT_SOURCES = vmkit.s
+  SOURCES = vmkit.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+
+else
+
+  USEDLIBS = JnJVM.a Classpath.a JnjvmCompiler.a Allocator.a CommonThread.a \
+	     Mvm.a MvmCompiler.a $(GCLIB).a
+endif
+
 LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo bitwriter
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/tools/vmkit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Makefile?rev=81145&r1=81144&r2=81145&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Makefile (original)
+++ vmkit/trunk/tools/vmkit/Makefile Mon Sep  7 02:33:49 2009
@@ -15,6 +15,8 @@
 
 ifeq ($(WITH_LLVM_GCC), 1)
 
+  MODULESNAME = vmkit
+
   ifeq ($(WITH_JNJVM), 1)
     USEDMODULES += JnJVM.bc Classpath.bc JnjvmCompiler.bc
   endif