X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=tests%2Fregression%2FMakefile.am;h=e2bbd45db395556001b5ae9da1d483c9e79a2e37;hb=add35c29eddac8e51219ba6410234e89e23fa796;hp=c7f19f5e45166b4c59d5b4086ac0502fae310da1;hpb=b8091573d2f5a6e9a92f74713c53486711124e65;p=cacao.git

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index c7f19f5e4..e2bbd45db 100644
--- 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,40 +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 3776 2005-11-23 22:33:55Z twisti $
+## $Id: Makefile.am 5404 2006-09-07 13:29:05Z christian $
 
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = \
+	codepatching \
+	native
+
 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/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 = \
-	HelloWorld.java \
-	jctest.java \
+	$(SOURCE_FILES) \
+	Test.sh \
+	\
 	jctest.output \
-	fptest.java \
 	fptest.output \
-	fp.java \
 	fp.output\
-	extest.java \
 	extest.2output \
-	clinitexception \
 	clinitexception.2output \
-	LoadDisplacementOverflow.java \
 	LoadDisplacementOverflow.output \
-	FieldDisplacementOverflow.java \
 	FieldDisplacementOverflow.output \
-	StackDisplacementOverflow.java \
 	StackDisplacementOverflow.output
 
 CLEANFILES = \
@@ -73,16 +82,17 @@ OUTPUT_JAVA_TESTS = \
 	FieldDisplacementOverflow \
 	StackDisplacementOverflow
 
-checkall: $(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 "$@: "
+	@echo -nowarn -n "$@: "
 	@$(JAVA) $(JAVAFLAGS) $@
 
 
 $(OUTPUT_JAVA_TESTS):
-	@$(JAVAC) -d . $(srcdir)/$@.java
 	@$(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)