From: Christian Thalinger Date: Sat, 9 Feb 2008 12:25:59 +0000 (+0100) Subject: * m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed jikes and X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=cacao.git;a=commitdiff_plain;h=ce9648fd1bae3eb91e708fe0962ef2902b6c9f6e * m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed jikes and -bootclasspath. * src/lib/Makefile.am (BOOTCLASSPATH): Added. * tests/regression/Makefile.am (BOOTCLASSPATH): Likewise. (JAVACMD): Likewise. (JAVACCMD): Likewise. * tests/regression/assertion/Makefile.am: Likewise. * tests/regression/codepatching/Makefile.am: Likewise. * tests/regression/native/Makefile.am: Likewise. --- diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4 index caa71e53a..977c6bf2f 100644 --- a/m4/ac_prog_javac.m4 +++ b/m4/ac_prog_javac.m4 @@ -37,9 +37,9 @@ dnl @license GPLWithACException AC_DEFUN([AC_PROG_JAVAC],[ AC_REQUIRE([AC_EXEEXT])dnl if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "javac$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "ecj$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "gcj$EXEEXT -C -bootclasspath ${CLASSPATH_CLASSES}" "jikes$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}") + test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "javac$EXEEXT" "ecj$EXEEXT" "gcj$EXEEXT -C") else - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "javac$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "ecj$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "gcj$EXEEXT -C -bootclasspath ${CLASSPATH_CLASSES}" "jikes$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}", $JAVAPREFIX) + test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "javac$EXEEXT" "ecj$EXEEXT" "gcj$EXEEXT -C", $JAVAPREFIX) fi test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AC_PROG_JAVAC_WORKS diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index bdc41c2dc..b163f1f6b 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -100,12 +100,18 @@ pkgdata_DATA = nozip endif endif +if WITH_CLASSPATH_GNU +BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES) +else +BOOTCLASSPATH = $(CLASSPATH_CLASSES) +endif + if ENABLE_ZLIB VM_ZIP = ../vm.zip vm.zip: $(VM_JAVA_FILES) $(mkdir_p) classes - $(JAVAC) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES) + $(JAVAC) -bootclasspath $(BOOTCLASSPATH) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES) @if test "$(JAR)" = "zip" -o "$(JAR)" = "zip.exe"; then \ cd classes && $(JAR) -r -D $(VM_ZIP) .; \ else \ @@ -114,7 +120,7 @@ vm.zip: $(VM_JAVA_FILES) else nozip: $(VM_JAVA_FILES) $(mkdir_p) classes - $(JAVAC) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES) + $(JAVAC) -bootclasspath $(BOOTCLASSPATH) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES) endif clean-local: 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: diff --git a/tests/regression/assertion/Makefile.am b/tests/regression/assertion/Makefile.am index 367bb0493..16e496986 100644 --- a/tests/regression/assertion/Makefile.am +++ b/tests/regression/assertion/Makefile.am @@ -21,14 +21,17 @@ ## 02110-1301, USA. -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)/testassertions.java \ $(srcdir)/packagetest/testassertions.java @@ -44,7 +47,7 @@ CLEANFILES = \ *.class \ *.thisoutput \ packagetest/*.class - + ASSERTION_TESTS = \ EA_TEST1 \ EA_TEST2 \ @@ -70,84 +73,83 @@ ASSERTION_TESTS = \ DA_CLASS_TEST5 \ ESA_TEST1 \ ESA_TEST2 - check: build $(ASSERTION_TESTS) build: - @$(JAVAC) -d . $(SOURCE_FILES) + @$(JAVACCMD) -d . $(SOURCE_FILES) EA_TEST1: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -ea $(JAVAFLAGS)" testassertions eatest1 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -ea" testassertions eatest1 enabled $(srcdir) EA_TEST2: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -enableassertions $(JAVAFLAGS)" testassertions eatest2 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -enableassertions" testassertions eatest2 enabled $(srcdir) EA_PACKAGE_TEST1: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -da -ea:packagetest... $(JAVAFLAGS)" packagetest.testassertions eapackagetest1 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -da -ea:packagetest..." packagetest.testassertions eapackagetest1 enabled $(srcdir) EA_PACKAGE_TEST2: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -disableassertions -ea:packagetest... $(JAVAFLAGS)" packagetest.testassertions eapackagetest2 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -disableassertions -ea:packagetest..." packagetest.testassertions eapackagetest2 enabled $(srcdir) EA_PACKAGE_TEST3: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -disableassertions -enableassertions:packagetest... $(JAVAFLAGS)" packagetest.testassertions eapackagetest3 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -disableassertions -enableassertions:packagetest..." packagetest.testassertions eapackagetest3 enabled $(srcdir) EA_PACKAGE_TEST4: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -enableassertions:packagetest... -disableassertions $(JAVAFLAGS)" packagetest.testassertions eapackagetest4 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -enableassertions:packagetest... -disableassertions " packagetest.testassertions eapackagetest4 enabled $(srcdir) EA_PACKAGE_TEST5: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -da -enableassertions:packagetest... $(JAVAFLAGS)" packagetest.testassertions eapackagetest5 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -da -enableassertions:packagetest..." packagetest.testassertions eapackagetest5 enabled $(srcdir) EA_CLASS_TEST1: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -da -ea:testassertions $(JAVAFLAGS)" testassertions eaclasstest1 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -da -ea:testassertions" testassertions eaclasstest1 enabled $(srcdir) EA_CLASS_TEST2: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -disableassertions -ea:testassertions $(JAVAFLAGS)" testassertions eaclasstest2 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -disableassertions -ea:testassertions" testassertions eaclasstest2 enabled $(srcdir) EA_CLASS_TEST3: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -disableassertions -enableassertions:testassertions $(JAVAFLAGS)" testassertions eaclasstest3 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -disableassertions -enableassertions:testassertions" testassertions eaclasstest3 enabled $(srcdir) EA_CLASS_TEST4: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -enableassertions:testassertions -disableassertions $(JAVAFLAGS)" testassertions eaclasstest4 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -enableassertions:testassertions -disableassertions " testassertions eaclasstest4 enabled $(srcdir) EA_CLASS_TEST5: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -da -enableassertions:testassertions $(JAVAFLAGS)" testassertions eaclasstest5 enabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -da -enableassertions:testassertions" testassertions eaclasstest5 enabled $(srcdir) DA_PACKAGE_TEST1: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -da:packagetest... -ea $(JAVAFLAGS)" packagetest.testassertions dapackagetest1 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -da:packagetest... -ea" packagetest.testassertions dapackagetest1 disabled $(srcdir) DA_PACKAGE_TEST2: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -disableassertions:packagetest... -ea $(JAVAFLAGS)" packagetest.testassertions dapackagetest2 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -disableassertions:packagetest... -ea" packagetest.testassertions dapackagetest2 disabled $(srcdir) DA_PACKAGE_TEST3: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -disableassertions:packagetest... -enableassertions $(JAVAFLAGS)" packagetest.testassertions dapackagetest3 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -disableassertions:packagetest... -enableassertions" packagetest.testassertions dapackagetest3 disabled $(srcdir) DA_PACKAGE_TEST4: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -enableassertions -disableassertions:packagetest... $(JAVAFLAGS)" packagetest.testassertions dapackagetest4 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -enableassertions -disableassertions:packagetest... " packagetest.testassertions dapackagetest4 disabled $(srcdir) DA_PACKAGE_TEST5: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -da:packagetest... -enableassertions $(JAVAFLAGS)" packagetest.testassertions dapackagetest5 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -da:packagetest... -enableassertions" packagetest.testassertions dapackagetest5 disabled $(srcdir) DA_CLASS_TEST1: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -ea -da:testassertions $(JAVAFLAGS)" testassertions daclasstest1 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -ea -da:testassertions" testassertions daclasstest1 disabled $(srcdir) DA_CLASS_TEST2: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -enableassertions -da:testassertions $(JAVAFLAGS)" testassertions daclasstest2 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -enableassertions -da:testassertions" testassertions daclasstest2 disabled $(srcdir) DA_CLASS_TEST3: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -enableassertions -disableassertions:testassertions $(JAVAFLAGS)" testassertions daclasstest3 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -enableassertions -disableassertions:testassertions" testassertions daclasstest3 disabled $(srcdir) DA_CLASS_TEST4: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -disableassertions:testassertions -enableassertions $(JAVAFLAGS)" testassertions daclasstest4 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -disableassertions:testassertions -enableassertions " testassertions daclasstest4 disabled $(srcdir) DA_CLASS_TEST5: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -ea -disableassertions:testassertions $(JAVAFLAGS)" testassertions daclasstest5 disabled $(srcdir) - + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -ea -disableassertions:testassertions" testassertions daclasstest5 disabled $(srcdir) + ESA_TEST1: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -esa $(JAVAFLAGS)" testassertions esatest1 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -esa" testassertions esatest1 disabled $(srcdir) ESA_TEST2: - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVA) -enablesystemassertions $(JAVAFLAGS)" testassertions esatest2 disabled $(srcdir) + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -enablesystemassertions" testassertions esatest2 disabled $(srcdir) ## Local variables: diff --git a/tests/regression/codepatching/Makefile.am b/tests/regression/codepatching/Makefile.am index 98712def2..8ba4acc15 100644 --- a/tests/regression/codepatching/Makefile.am +++ b/tests/regression/codepatching/Makefile.am @@ -1,9 +1,7 @@ ## tests/regression/codepatching/Makefile.am ## -## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel, -## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, -## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, -## J. Wenninger, Institut f. Computersprachen - TU Wien +## Copyright (C) 1996-2005, 2006, 2008 +## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO ## ## This file is part of CACAO. ## @@ -21,20 +19,19 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301, USA. -## -## Contact: cacao@cacaojvm.org -## -## Authors: Christian Thalinger -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)/aastoreconstClass.java \ $(srcdir)/checkcastC.java \ @@ -131,11 +128,11 @@ CLASSES = \ CLEANFILES = \ *.class -check: build - @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVA) $(JAVAFLAGS) test - build: - @$(JAVAC) -nowarn -d . $(SOURCE_FILES) + @$(JAVACCMD) -d . $(SOURCE_FILES) + +check: build + @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) test remove: $(RM) $(CLASSES) diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am index d45f492c3..815aa4b1d 100644 --- a/tests/regression/native/Makefile.am +++ b/tests/regression/native/Makefile.am @@ -23,17 +23,17 @@ 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 +JAVA = $(top_builddir)/src/cacao/cacao +JAVAH = $(CACAOH) if WITH_CLASSPATH_GNU -JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES) -JAVAHFLAGS = -bootclasspath $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES) +BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES) else -JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES) -JAVAHFLAGS = -bootclasspath $(CLASSPATH_CLASSES) +BOOTCLASSPATH = $(CLASSPATH_CLASSES) endif -JAVAH = $(CACAOH) +JAVACMD = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH) +JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH) SOURCE_FILES = \ checkjni.java \ @@ -64,10 +64,10 @@ TESTNAMES = \ check: $(TESTNAMES) $(TESTNAMES) $(NOTESTNAMES): - @$(JAVAC) -nowarn -d . $(srcdir)/$@.java - @$(JAVAH) $(JAVAHFLAGS) $@ + @$(JAVACCMD) -d . $(srcdir)/$@.java + @$(JAVAH) -bootclasspath $(BOOTCLASSPATH) $@ @$(CC) -shared $(AM_CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC - @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: