From: twisti <none@none>
Date: Thu, 28 Dec 2006 13:43:06 +0000 (+0000)
Subject: * tests/regression/Makefile.am,
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=ff318b1ee43733dccfe22ecf1979913ad9061a6a;p=cacao.git

* 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 4ff4bb495..b65c6eed4 100644
--- 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 d20bf02c3..8c4577073 100644
--- 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 1b682a603..25e7be3ed 100644
--- 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 9fa65b16e..90768984c 100644
--- 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 = \