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.
-## $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
## Process this file with automake to produce Makefile.in
$(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 \
$(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 \
$(top_srcdir)/src/lib/vm/reference/java/lang/VMThrowable.java \
$(top_srcdir)/src/lib/vm/reference/java/security/VMAccessController.java
$(top_srcdir)/src/lib/vm/reference/java/lang/VMThrowable.java \
$(top_srcdir)/src/lib/vm/reference/java/security/VMAccessController.java
+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)
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
-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
@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
clean-local:
-rm -rf classes
-## $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
## 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
vm/libnativevm.la \
$(JVMTI_LIB)
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)
GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
-## $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
## Process this file with automake to produce Makefile.in
CACAOH = $(top_builddir)/src/cacaoh/cacaoh
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)
GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
Joseph Wenninger
Christian Thalinger
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 $
/* define some CACAO paths ****************************************************/
/* 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"
#define CLASSPATH_GLIBJ_ZIP_PATH CLASSPATH_PREFIX "/share/classpath/" GLIBJZ_STRING
#define CLASSPATH_LIBRARY_PATH CLASSPATH_LIBDIR "/classpath"