* tests/regression/Makefile.am,

tests/regression/codepatching/Makefile.am,
tests/regression/jasmin/Makefile.am,
tests/regression/native/Makefile.am (JAVAFLAGS) [WITH_CLASSPATH_GNU]:
Set differently for GNU Classpath.

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 4ff4bb4957cf16856a19c486aa84af6085ba3987..b65c6eed48f1ba6378997394e7c24bb12d09bfc0 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -26,7 +26,7 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## $Id: Makefile.am 6247 2006-12-27 22:31:52Z twisti $
+## $Id: Makefile.am 6257 2006-12-28 13:43:06Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -36,7 +36,12 @@ SUBDIRS = \
        native
 
 JAVA      = $(top_builddir)/src/cacao/cacao
+
+if WITH_CLASSPATH_GNU
 JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+else
+JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+endif
 
 SOURCE_FILES = \
        $(srcdir)/HelloWorld.java \

diff --git a/tests/regression/codepatching/Makefile.am b/tests/regression/codepatching/Makefile.am
index d20bf02c3c1307c3025555aaffabf9cd371e231c..8c4577073ccd0fd969e668077dbe4364d60a20ad 100644 (file)
--- a/tests/regression/codepatching/Makefile.am
+++ b/tests/regression/codepatching/Makefile.am
@@ -26,12 +26,17 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## $Id: Makefile.am 6247 2006-12-27 22:31:52Z twisti $
+## $Id: Makefile.am 6257 2006-12-28 13:43:06Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 JAVA      = $(top_builddir)/src/cacao/cacao
+
+if WITH_CLASSPATH_GNU
 JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+else
+JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+endif
 
 SOURCE_FILES = \
        $(srcdir)/aastoreconstClass.java \

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index 1b682a603db8208ad93183a5b3ec5139de5c4371..25e7be3ed72284998edaa4b1aa9c3a29772e538c 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -32,7 +32,12 @@
 ## Process this file with automake to produce Makefile.in
 
 JAVA      = $(top_builddir)/src/cacao/cacao
+
+if WITH_CLASSPATH_GNU
 JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+else
+JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+endif
 
 JASMIN_TESTS = \
        $(srcdir)/test_coalesce_simple_store.j \

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index 9fa65b16e1932d39a0760dda8e4773da6b2e67d6..90768984c56cf50bf3fdbf76d3008a1b67be1387 100644 (file)
--- a/tests/regression/native/Makefile.am
+++ b/tests/regression/native/Makefile.am
@@ -26,14 +26,20 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## $Id: Makefile.am 6247 2006-12-27 22:31:52Z twisti $
+## $Id: Makefile.am 6257 2006-12-28 13:43:06Z 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
+
+if WITH_CLASSPATH_GNU
 JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+else
+JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+endif
+
 JAVAH     = $(top_builddir)/src/cacaoh/cacaoh
 
 SOURCE_FILES = \