* src/vm/global.h (CACAO_VM_ZIP_PATH): Set correctly for ifndef

ENABLE_ZLIB.
* src/lib/Makefile.am (JAVA_VM_FILES): Renamed to VM_JAVA_FILES.
(VM_CLASS_FILES): Added.
(pkgdata_DATA): Set to class files for ifndef ENABLE_ZLIB.
* src/native/include/Makefile.am (VM_ZIP): Set correctly for ifndef
ENABLE_ZLIB.
* src/native/Makefile.am (VM_ZIP): Likewise.

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ca77b463b7af17115a45d3b3b013a951518d0cb9..bcd9507ec41558863fd6018cc53a129211450e2e 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4403 2006-02-02 09:16:42Z twisti $
+## $Id: Makefile.am 4416 2006-02-03 22:03:30Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -37,7 +37,7 @@ EXTRA_DIST = \
 
 CLEANFILES = vm.zip
 
-JAVA_VM_FILES = \
+VM_JAVA_FILES = \
        $(top_srcdir)/src/lib/vm/reference/gnu/classpath/VMStackWalker.java \
        $(top_srcdir)/src/lib/vm/reference/java/lang/VMClassLoader.java \
        $(top_srcdir)/src/lib/vm/reference/java/lang/VMString.java \
@@ -45,19 +45,34 @@ JAVA_VM_FILES = \
        $(top_srcdir)/src/lib/vm/reference/java/lang/VMThrowable.java \
        $(top_srcdir)/src/lib/vm/reference/java/security/VMAccessController.java
 
-VM_ZIP = ../vm.zip
+VM_CLASS_FILES = \
+       classes/gnu/classpath/VMStackWalker.class \
+       classes/java/lang/VMClassLoader.class \
+       classes/java/lang/VMString.class \
+       classes/java/lang/VMThread.class \
+       classes/java/lang/VMThrowable.class \
+       classes/java/security/VMAccessController.class
+
 GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
 
+$(VM_CLASS_FILES): $(VM_JAVA_FILES)
+       $(mkdir_p) classes
+       $(JAVAC) -bootclasspath $(GLIBJ_ZIP) -d classes $(VM_JAVA_FILES)
+
+if ENABLE_ZLIB
 pkgdata_DATA = vm.zip
 
-vm.zip: $(JAVA_VM_FILES)
-       $(mkdir_p) classes
-       $(JAVAC) -bootclasspath $(GLIBJ_ZIP) -d classes $(JAVA_VM_FILES)
+VM_ZIP = ../vm.zip
+
+vm.zip: $(VM_CLASS_FILES)
        @if test "$(JAR)" = "zip"; then \
            cd classes && $(JAR) -r -D $(VM_ZIP) .; \
        else \
            cd classes && $(JAR) cvf $(VM_ZIP) .; \
        fi
+else
+pkgdata_DATA = $(VM_CLASS_FILES)
+endif
 
 clean-local:
        -rm -rf classes

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index fe2403ae51d9e1fbc0d99f88ab2f7424a97bf566..c2170542dbf90f5ed1ea408807851b2d62b3ecbe 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,13 +28,15 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4413 2006-02-03 20:54:16Z twisti $
+## $Id: Makefile.am 4416 2006-02-03 22:03:30Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir)/src
 
-SUBDIRS = include vm
+SUBDIRS = \
+       include \
+       vm
 
 CLEANFILES =
 
@@ -61,7 +63,12 @@ libnative_la_LIBADD = \
        vm/libnativevm.la \
        $(JVMTI_LIB)
 
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
+if ENABLE_ZLIB
+VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_FILE)
+else
+VM_ZIP = $(top_builddir)/src/lib/classes/
+endif
+
 GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
 
 CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 44305e879c49ffad1806d08068130ddd1fa2bfa6..fc907db65f971802a178833b84802d62e3b0744a 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4416 2006-02-03 22:03:30Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -129,7 +129,12 @@ endif
 
 CACAOH = $(top_builddir)/src/cacaoh/cacaoh
 
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
+if ENABLE_ZLIB
+VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_FILE)
+else
+VM_ZIP = $(top_builddir)/src/lib/classes/
+endif
+
 GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
 
 CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)

diff --git a/src/vm/global.h b/src/vm/global.h
index b3e918e362e5859bea1807ee84b2f20b30f19b00..9518580b8e3c94728d12ceffa19506797755e36d 100644 (file)
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -33,7 +33,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: global.h 4357 2006-01-22 23:33:38Z twisti $
+   $Id: global.h 4416 2006-02-03 22:03:30Z twisti $
 
 */
 
@@ -78,7 +78,12 @@ typedef struct java_objectarray java_objectarray;
 
 /* define some CACAO paths ****************************************************/
 
-#define CACAO_VM_ZIP_PATH           CACAO_PREFIX "/share/cacao/vm.zip"
+#if defined(ENABLE_ZLIB)
+# define CACAO_VM_ZIP_PATH          CACAO_PREFIX "/share/cacao/" VM_ZIP_FILE
+#else
+# define CACAO_VM_ZIP_PATH          CACAO_PREFIX "/share/cacao/"
+#endif
+
 #define CLASSPATH_GLIBJ_ZIP_PATH    CLASSPATH_PREFIX "/share/classpath/" GLIBJZ_STRING
 #define CLASSPATH_LIBRARY_PATH      CLASSPATH_LIBDIR "/classpath"