* tests/regression/Makefile.am (JAVAFLAGS): Use flat vm classes and

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

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index ef3b921f94f0719a7527ea17ca994e0482f6f6a3..b45d6a1cd30c9162c09d9bec625246b204d1d8e1 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,9 +1,9 @@
 ## tests/regression/Makefile.am
 ##
-## Copyright (C) 1996-2005 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 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
 ##
 ## This file is part of CACAO.
 ##
@@ -19,42 +19,49 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 ##
-## Contact: cacao@complang.tuwien.ac.at
+## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4314 2006-01-19 22:21:23Z twisti $
+## $Id: Makefile.am 5015 2006-06-06 13:13:46Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = codepatching
+SUBDIRS = \
+       codepatching \
+       native
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
+
+SOURCE_FILES = \
+       $(srcdir)/HelloWorld.java \
+       $(srcdir)/jctest.java \
+       $(srcdir)/fptest.java \
+       $(srcdir)/fp.java \
+       $(srcdir)/extest.java \
+       $(srcdir)/extest_clinit.java \
+       $(srcdir)/clinitexception.java \
+       $(srcdir)/LoadDisplacementOverflow.java \
+       $(srcdir)/FieldDisplacementOverflow.java \
+       $(srcdir)/StackDisplacementOverflow.java
 
 EXTRA_DIST = \
+       $(SOURCE_FILES) \
        Test.sh \
-       HelloWorld.java \
-       jctest.java \
+       \
        jctest.output \
-       fptest.java \
        fptest.output \
-       fp.java \
        fp.output\
-       extest.java \
        extest.2output \
-       clinitexception.java \
        clinitexception.2output \
-       LoadDisplacementOverflow.java \
        LoadDisplacementOverflow.output \
-       FieldDisplacementOverflow.java \
        FieldDisplacementOverflow.output \
-       StackDisplacementOverflow.java \
        StackDisplacementOverflow.output
 
 CLEANFILES = \
@@ -75,16 +82,17 @@ OUTPUT_JAVA_TESTS = \
        FieldDisplacementOverflow \
        StackDisplacementOverflow
 
-check: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+
+build:
+       @$(JAVAC) -d . $(SOURCE_FILES)
 
 $(SIMPLE_JAVA_TESTS):
-       @$(JAVAC) -d . $(srcdir)/$@.java
        @echo -n "$@: "
        @$(JAVA) $(JAVAFLAGS) $@
 
 
 $(OUTPUT_JAVA_TESTS):
-       @$(JAVAC) -d . $(srcdir)/$@.java
        @$(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)