X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=1f25a604afb787dc01ab81424ccfcbdac0636110;hb=ce9648fd1bae3eb91e708fe0962ef2902b6c9f6e;hp=7b6a8b505263eb3627be3020e38273456524b252;hpb=d5f80f01fbf7ad28cddc97ba05b649789d54faec;p=cacao.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 7b6a8b505..1f25a604a 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -27,14 +27,17 @@ SUBDIRS = \
 	jasmin \
 	native
 
-JAVA      = $(top_builddir)/src/cacao/cacao
+JAVA = $(top_builddir)/src/cacao/cacao
 
 if WITH_CLASSPATH_GNU
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
 else
-JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+BOOTCLASSPATH = $(CLASSPATH_CLASSES)
 endif
 
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+
 SOURCE_FILES = \
 	$(srcdir)/HelloWorld.java \
 	$(srcdir)/jctest.java \
@@ -86,15 +89,14 @@ OUTPUT_JAVA_TESTS = \
 check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
 
 build:
-	@$(JAVAC) -d . $(SOURCE_FILES)
+	@$(JAVACCMD) -d . $(SOURCE_FILES)
 
 $(SIMPLE_JAVA_TESTS):
 	@echo "$@: "
-	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVA) $(JAVAFLAGS) $@
-
+	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) $@
 
 $(OUTPUT_JAVA_TESTS):
-	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
+	@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD)" $@ $(srcdir)
 
 
 ## Local variables: