* m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed jikes and

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

diff --git a/tests/regression/codepatching/Makefile.am b/tests/regression/codepatching/Makefile.am
index 0625a0816ac41cea325689fbbdce0bbc80895cbe..8ba4acc15e8c2bc91c602f933130a947d161043d 100644 (file)
--- 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 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.
 ##
@@ -19,54 +17,64 @@
 ##
 ## 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.
-##
-## Contact: cacao@complang.tuwien.ac.at
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 4314 2006-01-19 22:21:23Z twisti $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+
+
+JAVA = $(top_builddir)/src/cacao/cacao
 
-## Process this file with automake to produce Makefile.in
+if WITH_CLASSPATH_GNU
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
+else
+BOOTCLASSPATH = $(CLASSPATH_CLASSES)
+endif
 
-JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
-       checkcastC.java \
-       checkcastI.java \
-       getfieldD.java \
-       getfieldF.java \
-       getfieldI.java \
-       getfieldJ.java \
-       getfieldL.java \
-       getstaticD.java \
-       getstaticF.java \
-       getstaticI.java \
-       getstaticJ.java \
-       getstaticL.java \
-       instanceofC.java \
-       instanceofI.java \
-       invokespecial.java \
-       invokestatic.java \
-       multianewarray.java \
-       newarray.java \
-       putfieldconstIF.java \
-       putfieldconstJDL.java \
-       putfieldD.java \
-       putfieldF.java \
-       putfieldI.java \
-       putfieldJ.java \
-       putfieldL.java \
-       putstaticD.java \
-       putstaticF.java \
-       putstaticI.java \
-       putstaticJ.java \
-       putstaticL.java \
-       test.java
+       $(srcdir)/aastoreconstClass.java \
+       $(srcdir)/checkcastC.java \
+       $(srcdir)/checkcastI.java \
+       $(srcdir)/getfieldD.java \
+       $(srcdir)/getfieldF.java \
+       $(srcdir)/getfieldI.java \
+       $(srcdir)/getfieldJ.java \
+       $(srcdir)/getfieldL.java \
+       $(srcdir)/getstaticD.java \
+       $(srcdir)/getstaticF.java \
+       $(srcdir)/getstaticI.java \
+       $(srcdir)/getstaticJ.java \
+       $(srcdir)/getstaticL.java \
+       $(srcdir)/instanceofC.java \
+       $(srcdir)/instanceofI.java \
+       $(srcdir)/invokespecial.java \
+       $(srcdir)/invokestatic.java \
+       $(srcdir)/multianewarray.java \
+       $(srcdir)/newarray.java \
+       $(srcdir)/putfieldD.java \
+       $(srcdir)/putfieldF.java \
+       $(srcdir)/putfieldI.java \
+       $(srcdir)/putfieldJ.java \
+       $(srcdir)/putfieldL.java \
+       $(srcdir)/putfieldconstC.java \
+       $(srcdir)/putfieldconstD.java \
+       $(srcdir)/putfieldconstF.java \
+       $(srcdir)/putfieldconstI.java \
+       $(srcdir)/putfieldconstJ.java \
+       $(srcdir)/putfieldconstL.java \
+       $(srcdir)/putstaticD.java \
+       $(srcdir)/putstaticF.java \
+       $(srcdir)/putstaticI.java \
+       $(srcdir)/putstaticJ.java \
+       $(srcdir)/putstaticL.java \
+       $(srcdir)/putstaticconstC.java \
+       $(srcdir)/putstaticconstD.java \
+       $(srcdir)/putstaticconstF.java \
+       $(srcdir)/putstaticconstI.java \
+       $(srcdir)/putstaticconstJ.java \
+       $(srcdir)/putstaticconstL.java \
+       $(srcdir)/test.java
 
 EXTRA_DIST = \
        $(SOURCE_FILES)
@@ -75,6 +83,7 @@ MAINCLASS = \
        test.class
 
 CLASSES = \
+       aastoreconstClass.class \
        checkcastC.class \
        checkcastI.class \
        getfieldD.class \
@@ -93,28 +102,37 @@ CLASSES = \
        invokestatic.class \
        multianewarray.class \
        newarray.class \
-       putfieldconstIF.class \
-       putfieldconstJDL.class \
        putfieldD.class \
        putfieldF.class \
        putfieldI.class \
        putfieldJ.class \
        putfieldL.class \
+       putfieldconstC.class \
+       putfieldconstD.class \
+       putfieldconstF.class \
+       putfieldconstI.class \
+       putfieldconstJ.class \
+       putfieldconstL.class \
        putstaticD.class \
        putstaticF.class \
        putstaticI.class \
        putstaticJ.class \
-       putstaticL.class
+       putstaticL.class \
+       putstaticconstC.class \
+       putstaticconstD.class \
+       putstaticconstF.class \
+       putstaticconstI.class \
+       putstaticconstJ.class \
+       putstaticconstL.class
 
 CLEANFILES = \
-       $(MAINCLASS) \
-       $(CLASSES)
+       *.class
 
 build:
-       $(JAVAC) $(SOURCE_FILES)
+       @$(JAVACCMD) -d . $(SOURCE_FILES)
 
 check: build
-       $(JAVA) $(JAVAFLAGS) test
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) test
 
 remove:
        $(RM) $(CLASSES)