[vmkit-commits] [vmkit] r129222 - in /vmkit/branches/release_029: autoconf/configure.ac configure mmtk/Makefile mmtk/java/build.xml mmtk/java/build.xml.in

[Nicolas Geoffray]

Author: geoffray
Date: Sat Apr  9 14:38:33 2011
New Revision: 129222

URL: http://llvm.org/viewvc/llvm-project?rev=129222&view=rev
Log:
Build fixes.


Added:
    vmkit/branches/release_029/mmtk/java/build.xml.in
Removed:
    vmkit/branches/release_029/mmtk/java/build.xml
Modified:
    vmkit/branches/release_029/autoconf/configure.ac
    vmkit/branches/release_029/configure
    vmkit/branches/release_029/mmtk/Makefile

Modified: vmkit/branches/release_029/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_029/autoconf/configure.ac?rev=129222&r1=129221&r2=129222&view=diff
==============================================================================
--- vmkit/branches/release_029/autoconf/configure.ac (original)
+++ vmkit/branches/release_029/autoconf/configure.ac Sat Apr  9 14:38:33 2011
@@ -626,6 +626,7 @@
 AC_CONFIG_FILES([lib/J3/Classpath/Classpath.h])
 AC_CONFIG_FILES([tools/llcj/LinkPaths.h])
 AC_CONFIG_FILES([mmtk/java/src/org/j3/config/Selected.java])
+AC_CONFIG_FILES([mmtk/java/build.xml])
 
 dnl Do special configuration of Makefiles
 AC_CONFIG_MAKEFILE(Makefile)

Modified: vmkit/branches/release_029/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_029/configure?rev=129222&r1=129221&r2=129222&view=diff
==============================================================================
--- vmkit/branches/release_029/configure (original)
+++ vmkit/branches/release_029/configure Sat Apr  9 14:38:33 2011
@@ -6135,6 +6135,8 @@
 
 ac_config_files="$ac_config_files mmtk/java/src/org/j3/config/Selected.java"
 
+ac_config_files="$ac_config_files mmtk/java/build.xml"
+
 
 ac_config_commands="$ac_config_commands Makefile"
 
@@ -6843,6 +6845,7 @@
     "lib/J3/Classpath/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/J3/Classpath/Classpath.h" ;;
     "tools/llcj/LinkPaths.h") CONFIG_FILES="$CONFIG_FILES tools/llcj/LinkPaths.h" ;;
     "mmtk/java/src/org/j3/config/Selected.java") CONFIG_FILES="$CONFIG_FILES mmtk/java/src/org/j3/config/Selected.java" ;;
+    "mmtk/java/build.xml") CONFIG_FILES="$CONFIG_FILES mmtk/java/build.xml" ;;
     "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
     "lib/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
 

Modified: vmkit/branches/release_029/mmtk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_029/mmtk/Makefile?rev=129222&r1=129221&r2=129222&view=diff
==============================================================================
--- vmkit/branches/release_029/mmtk/Makefile (original)
+++ vmkit/branches/release_029/mmtk/Makefile Sat Apr  9 14:38:33 2011
@@ -9,7 +9,6 @@
 LEVEL = ..
 
 DIRS = magic mmtk-j3 mmtk-alloc java inline
-EXTRA_DIST = config/marksweep
 
 include $(LEVEL)/Makefile.config
 

Removed: vmkit/branches/release_029/mmtk/java/build.xml
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_029/mmtk/java/build.xml?rev=129221&view=auto
==============================================================================
--- vmkit/branches/release_029/mmtk/java/build.xml (original)
+++ vmkit/branches/release_029/mmtk/java/build.xml (removed)
@@ -1,9 +0,0 @@
-<project name="MMTK-VMKit" default="main" basedir=".">
-  <target name="main">
-    <mkdir dir="classes"/>
-    <javac srcdir="src" destdir="classes" source="1.5"/>
-    <jar jarfile="mmtk-vmkit.jar">
-      <fileset dir="classes"/>
-    </jar>
-  </target>
-</project>

Added: vmkit/branches/release_029/mmtk/java/build.xml.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_029/mmtk/java/build.xml.in?rev=129222&view=auto
==============================================================================
--- vmkit/branches/release_029/mmtk/java/build.xml.in (added)
+++ vmkit/branches/release_029/mmtk/java/build.xml.in Sat Apr  9 14:38:33 2011
@@ -0,0 +1,9 @@
+<project name="MMTK-VMKit" default="main" basedir=".">
+  <target name="main">
+    <mkdir dir="classes"/>
+    <javac srcdir="@abs_top_srcdir@/mmtk/java/src:./src" destdir="classes" source="1.5"/>
+    <jar jarfile="mmtk-vmkit.jar">
+      <fileset dir="classes"/>
+    </jar>
+  </target>
+</project>