[vmkit-commits] [vmkit] r83389 - in /vmkit/trunk/mmtk: Makefile java/Makefile mmtk-j3/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Tue Oct  6 11:46:44 2009
New Revision: 83389

URL: http://llvm.org/viewvc/llvm-project?rev=83389&view=rev
Log:
Makefile updates to compile MMTk.


Added:
    vmkit/trunk/mmtk/Makefile
    vmkit/trunk/mmtk/java/Makefile
Modified:
    vmkit/trunk/mmtk/mmtk-j3/Makefile

Added: vmkit/trunk/mmtk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/Makefile?rev=83389&view=auto

==============================================================================
--- vmkit/trunk/mmtk/Makefile (added)
+++ vmkit/trunk/mmtk/Makefile Tue Oct  6 11:46:44 2009
@@ -0,0 +1,16 @@
+##===- mmtk/Makefile ---------------------------------------*- Makefile -*-===##
+# 
+#                     The vmkit project
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+LEVEL = ..
+
+DIRS = magic mmtk-j3 java
+
+include $(LEVEL)/Makefile.config
+
+include $(LEVEL)/Makefile.common
+

Added: vmkit/trunk/mmtk/java/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/Makefile?rev=83389&view=auto

==============================================================================
--- vmkit/trunk/mmtk/java/Makefile (added)
+++ vmkit/trunk/mmtk/java/Makefile Tue Oct  6 11:46:44 2009
@@ -0,0 +1,16 @@
+##===- mmtk/java/Makefile ----------------------------------*- Makefile -*-===##
+# 
+#                     The vmkit project
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+LEVEL = ../..
+
+include $(LEVEL)/Makefile.config
+
+RUN_ANT = 1
+JARNAME = mmtk-vmkit
+
+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=83389&r1=83388&r2=83389&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Makefile Tue Oct  6 11:46:44 2009
@@ -1,6 +1,6 @@
-##===- mmtk/magic/Makefile ---------------------------------*- Makefile -*-===##
+##===- mmtk/mmtk-j3/Makefile -------------------------------*- Makefile -*-===##
 #
-#                     The LLVM Compiler Infrastructure
+#                     The vmkit project
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
@@ -8,7 +8,15 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-LIBRARYNAME = MMTKRuntime
+
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+  MODULE_NAME = MMTKRuntime
+else
+  LIBRARYNAME = MMTKRuntime
+endif
+
 LOADABLE_MODULE = 1
 USEDLIBS =