* m4/classpath.m4 (AC_CHECK_WITH_CLASSPATH_CLASSES): Set BOOTCLASSPATH

for Makefiles.
* tests/regression/Makefile.am,
tests/regression/assertion/Makefile.am,
tests/regression/codepatching/Makefile.am,
tests/regression/jasmin/Makefile.am,
tests/regression/native/Makefile.am,
tests/regression/resolving/Makefile.am (BOOTCLASSPATH): Removed.

diff --git a/m4/classpath.m4 b/m4/classpath.m4
index e659187f4167224d80b9e110178bcb22a138f773..ff3166737135328ba90641995c923a7242ee0701 100644 (file)
--- a/m4/classpath.m4
+++ b/m4/classpath.m4
@@ -92,6 +92,17 @@ AC_ARG_WITH([classpath-classes],
 AC_MSG_RESULT(${CLASSPATH_CLASSES})
 AC_DEFINE_UNQUOTED([CLASSPATH_CLASSES], "${CLASSPATH_CLASSES}", [Java core library classes])
 AC_SUBST(CLASSPATH_CLASSES)
+
+dnl define BOOTCLASSPATH for Makefiles
+case "${WITH_CLASSPATH}" in
+    cldc1.1 | gnu)
+        BOOTCLASSPATH="\$(top_builddir)/src/lib/classes:\$(CLASSPATH_CLASSES)"
+        ;;
+    *)
+        BOOTCLASSPATH="\$(CLASSPATH_CLASSES)"
+        ;;
+esac
+AC_SUBST(BOOTCLASSPATH)
 ])
 
 

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index cf014e4d60358b5fc0eda7b5f851a31fb8f868e0..6e2d5656b08813a8f7588c879302b94e07c75128 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -28,10 +28,9 @@ SUBDIRS = \
        native \
        resolving
 
-JAVA          = $(top_builddir)/src/cacao/cacao
-BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        $(srcdir)/HelloWorld.java \

diff --git a/tests/regression/assertion/Makefile.am b/tests/regression/assertion/Makefile.am
index 53a218dd2f3bef327c83ce4bb9c3fcbe585d0bfe..1e1dd614b9d23f9254d5f6bcdc204b1d85b906d2 100644 (file)
--- a/tests/regression/assertion/Makefile.am
+++ b/tests/regression/assertion/Makefile.am
@@ -21,10 +21,9 @@
 ## 02110-1301, USA.
 
 
-JAVA          = $(top_builddir)/src/cacao/cacao
-BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        $(srcdir)/testassertions.java \

diff --git a/tests/regression/codepatching/Makefile.am b/tests/regression/codepatching/Makefile.am
index 1826e8e1aab84fd889f195f7045d361c1fef20b9..99fe7fe22fc975800a8c0c90a1eb33f25aa76149 100644 (file)
--- a/tests/regression/codepatching/Makefile.am
+++ b/tests/regression/codepatching/Makefile.am
@@ -21,10 +21,9 @@
 ## 02110-1301, USA.
 
 
-JAVA          = $(top_builddir)/src/cacao/cacao
-BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        $(srcdir)/aastoreconstClass.java \

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index 2221059d083538308bddfcc270393456415ffa52..24daa08f72d2d366e3014abf3538940745013870 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -21,10 +21,9 @@
 ## 02110-1301, USA.
 
 
-JAVA          = $(top_builddir)/src/cacao/cacao
-BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 JASMIN_TESTS = \
        $(srcdir)/test_coalesce_simple_store.j \
@@ -118,8 +117,6 @@ JASMIN_TESTS = \
        $(srcdir)/test_verify_unspecced_ok_backward_with_new_on_stack.j \
        $(srcdir)/test_verify_unspecced_ok_new_in_local_within_try.j
 
-
-
 EXTRA_DIST = \
        $(srcdir)/runtest \
        $(srcdir)/show \

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index 83d9e34e350567a1e603a7d3ed0ecadd1136db05..8a0d134dc1b15c2516cee04546917db0f56072f0 100644 (file)
--- a/tests/regression/native/Makefile.am
+++ b/tests/regression/native/Makefile.am
@@ -23,12 +23,11 @@
 
 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
-JAVAH         = $(CACAOH)
-BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
-JAVAHCMD      = $(JAVAH) -bootclasspath $(BOOTCLASSPATH)
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVAH    = $(CACAOH)
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVAHCMD = $(JAVAH) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
        checkjni.java \
@@ -61,7 +60,7 @@ check: $(TESTNAMES)
 $(TESTNAMES) $(NOTESTNAMES):
        @$(JAVACCMD) -d . $(srcdir)/$@.java
        @$(JAVAHCMD) $@
-       @$(CC) -shared $(AM_CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC
+       @$(CC) -shared $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC
        @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs:. $(SHELL) $(srcdir)/../Test.sh "$(JAVACMD)" $@ $(srcdir)
 
 

diff --git a/tests/regression/resolving/Makefile.am b/tests/regression/resolving/Makefile.am
index eb2350e2fe4b8079505c9c48cb6aee31ce123e3e..34bcb1fd14e0e33ff3e76df37d1433d8c10374cc 100644 (file)
--- a/tests/regression/resolving/Makefile.am
+++ b/tests/regression/resolving/Makefile.am
@@ -26,10 +26,9 @@ SUBDIRS = \
        classes2 \
        classes3
 
-JAVA          = $(top_builddir)/src/cacao/cacao
-BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 HARNESS_SOURCE_FILES = \
        $(srcdir)/TestController.java \