* tests/regression/Makefile.am (JAVAFLAGS): Use flat vm classes and

CLASSPATH_GLIBJ_ZIP.
* tests/regression/codepatching/Makefile.am: Likewise.
* tests/regression/native/Makefile.am: Likewise.

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 37a2506542d7fd3a1059aadae128316762e16d5d..b45d6a1cd30c9162c09d9bec625246b204d1d8e1 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4441 2006-02-05 12:20:26Z twisti $
+## $Id: Makefile.am 5015 2006-06-06 13:13:46Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -37,7 +37,7 @@ SUBDIRS = \
        native
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/$(VM_ZIP_STRING):$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
 
 SOURCE_FILES = \
        $(srcdir)/HelloWorld.java \

diff --git a/tests/regression/codepatching/Makefile.am b/tests/regression/codepatching/Makefile.am
index 1f8a47666757698595db78b8035fabc6d652a09a..0714fcd0f153805e4ea713cd5cb78954d724c027 100644 (file)
--- a/tests/regression/codepatching/Makefile.am
+++ b/tests/regression/codepatching/Makefile.am
@@ -28,12 +28,12 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4858 2006-04-28 11:37:33Z twisti $
+## $Id: Makefile.am 5015 2006-06-06 13:13:46Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/$(VM_ZIP_STRING):$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
 
 SOURCE_FILES = \
        $(srcdir)/aastoreconstClass.java \

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index 66664001aff0dbdbf8b25bcbcdc63a173ce8fbfe..08cafa05665b33ec79473b9301d0401939d37da5 100644 (file)
--- a/tests/regression/native/Makefile.am
+++ b/tests/regression/native/Makefile.am
@@ -28,14 +28,14 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4695 2006-03-28 14:21:14Z twisti $
+## $Id: Makefile.am 5015 2006-06-06 13:13:46Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/$(VM_ZIP_STRING):$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING) -Djava.library.path=.
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP) -Djava.library.path=.
 JAVAH     = $(top_builddir)/src/cacaoh/cacaoh
 
 SOURCE_FILES = \