* tests/regression/Makefile.am: Renamed CLASSPATH_GLIBJ_ZIP to

CLASSPATH_CLASSES.
* tests/regression/codepatching/Makefile.am: Likewise.
* tests/regression/jasmin/Makefile.am: Likewise.
* tests/regression/native/Makefile.am: Likewise.

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 65028a3c4eb704a3acc70b5615d766c67a4ec103..4ff4bb4957cf16856a19c486aa84af6085ba3987 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -26,9 +26,7 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## Changes:
-##
-## $Id: Makefile.am 5810 2006-10-20 13:54:54Z twisti $
+## $Id: Makefile.am 6247 2006-12-27 22:31:52Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -38,7 +36,7 @@ SUBDIRS = \
        native
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
 
 SOURCE_FILES = \
        $(srcdir)/HelloWorld.java \

diff --git a/tests/regression/codepatching/Makefile.am b/tests/regression/codepatching/Makefile.am
index 6c1f6efc94dd9026cec9706c7a093181b0b6ee97..d20bf02c3c1307c3025555aaffabf9cd371e231c 100644 (file)
--- a/tests/regression/codepatching/Makefile.am
+++ b/tests/regression/codepatching/Makefile.am
@@ -26,14 +26,12 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## Changes:
-##
-## $Id: Makefile.am 5810 2006-10-20 13:54:54Z twisti $
+## $Id: Makefile.am 6247 2006-12-27 22:31:52Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
 
 SOURCE_FILES = \
        $(srcdir)/aastoreconstClass.java \

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index 30fa5adb279ae4a86e1f4b2c2018098e30e9579a..1b682a603db8208ad93183a5b3ec5139de5c4371 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -25,15 +25,14 @@
 ## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
-##
-## Changes: Edwin Steiner
+##          Edwin Steiner
 ##
 ## $Id$
 
 ## Process this file with automake to produce Makefile.in
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
 
 JASMIN_TESTS = \
        $(srcdir)/test_coalesce_simple_store.j \

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index aef2da714a6c84bb8a793129014def45d3f6e6da..9fa65b16e1932d39a0760dda8e4773da6b2e67d6 100644 (file)
--- a/tests/regression/native/Makefile.am
+++ b/tests/regression/native/Makefile.am
@@ -26,16 +26,14 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## Changes:
-##
-## $Id: Makefile.am 5810 2006-10-20 13:54:54Z twisti $
+## $Id: Makefile.am 6247 2006-12-27 22:31:52Z 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/classes/:$(CLASSPATH_GLIBJ_ZIP)
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
 JAVAH     = $(top_builddir)/src/cacaoh/cacaoh
 
 SOURCE_FILES = \