* CLASSPATH_INSTALL_DIR: Renamed to CLASSPATH_PREFIX.

[cacao.git] / tests / regression / Makefile.am

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index c7f19f5e45166b4c59d5b4086ac0502fae310da1..ae2d902d0b856e9047aa104f19e0aa7c32582215 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -28,15 +28,15 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3776 2005-11-23 22:33:55Z twisti $
+## $Id: Makefile.am 4218 2006-01-17 16:55:21Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ)
-JAVAC     = jikes -classpath $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) -nowarn
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
 
 EXTRA_DIST = \
+       Test.sh \
        HelloWorld.java \
        jctest.java \
        jctest.output \
@@ -46,7 +46,7 @@ EXTRA_DIST = \
        fp.output\
        extest.java \
        extest.2output \
-       clinitexception \
+       clinitexception.java \
        clinitexception.2output \
        LoadDisplacementOverflow.java \
        LoadDisplacementOverflow.output \
@@ -73,7 +73,7 @@ OUTPUT_JAVA_TESTS = \
        FieldDisplacementOverflow \
        StackDisplacementOverflow
 
-checkall: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
 
 $(SIMPLE_JAVA_TESTS):
        @$(JAVAC) -d . $(srcdir)/$@.java