2005-11-14 Tom Tromey <tromey@redhat.com>

[cacao.git] / src / lib / Makefile.am

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 1fe3860d828dd8203e418f889263a9b3648c4f46..6d6c32aa146e2cf02505b06d2d1a3a40750460c9 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,45 +28,51 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 2453 2005-05-11 15:37:35Z twisti $
+## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 CLEANFILES = vm.zip
 
 JAVA_VM_FILES = \
-       $(top_srcdir)/src/classpath/vm/reference/gnu/java/nio/VMPipe.java \
-       $(top_srcdir)/src/classpath/vm/reference/gnu/java/nio/VMSelector.java \
-       $(top_srcdir)/src/classpath/vm/reference/gnu/classpath/VMSystemProperties.java \
-       $(top_srcdir)/src/classpath/vm/reference/gnu/classpath/VMStackWalker.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/io/VMFile.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/io/VMObjectStreamClass.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/io/VMObjectInputStream.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMClass.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMClassLoader.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMCompiler.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMDouble.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMFloat.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMObject.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMProcess.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMRuntime.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMSystem.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMString.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMThread.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/VMThrowable.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/reflect/Constructor.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/reflect/Field.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/lang/reflect/Method.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/security/VMAccessController.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/util/VMTimeZone.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/nio/channels/VMChannels.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/net/VMInetAddress.java \
-       $(top_srcdir)/src/classpath/vm/reference/java/nio/VMDirectByteBuffer.java
+       $(top_srcdir)/src/lib/vm/reference/gnu/classpath/VMSystemProperties.java \
+       $(top_srcdir)/src/lib/vm/reference/gnu/classpath/VMStackWalker.java \
+       $(top_srcdir)/src/lib/vm/reference/gnu/java/nio/VMPipe.java \
+       $(top_srcdir)/src/lib/vm/reference/gnu/java/nio/VMSelector.java \
+       $(top_srcdir)/src/lib/vm/reference/java/io/VMFile.java \
+       $(top_srcdir)/src/lib/vm/reference/java/io/VMObjectStreamClass.java \
+       $(top_srcdir)/src/lib/vm/reference/java/io/VMObjectInputStream.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMClass.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMClassLoader.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMCompiler.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMDouble.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMFloat.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMObject.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMProcess.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMRuntime.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMSystem.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMString.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMThread.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/VMThrowable.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/reflect/Constructor.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/reflect/Field.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/reflect/Method.java \
+       $(top_srcdir)/src/lib/vm/reference/java/lang/reflect/VMProxy.java \
+       $(top_srcdir)/src/lib/vm/reference/java/net/VMInetAddress.java \
+       $(top_srcdir)/src/lib/vm/reference/java/nio/channels/VMChannels.java \
+       $(top_srcdir)/src/lib/vm/reference/java/nio/VMDirectByteBuffer.java \
+       $(top_srcdir)/src/lib/vm/reference/java/security/VMAccessController.java \
+       $(top_srcdir)/src/lib/vm/reference/java/util/VMTimeZone.java
 
-GLIBJ_ZIP = $(EXTERNAL_CLASSPATH_PREFIX)/share/classpath/glibj.zip
+# currently disabled by GNU classpath
+#      $(top_srcdir)/src/lib/vm/reference/gnu/classpath/jdwp/VMFrame.java \
+#      $(top_srcdir)/src/lib/vm/reference/gnu/classpath/jdwp/VMIdManager.java \
+#      $(top_srcdir)/src/lib/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java \
+#
 
-vmzipdir = $(prefix)/jre/lib
-vmzip_DATA = vm.zip
+GLIBJ_ZIP = $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ)
+
+pkgdata_DATA = vm.zip
 
 vm.zip: $(JAVA_VM_FILES)
        jikes -bootclasspath $(GLIBJ_ZIP) -d classes $(JAVA_VM_FILES)