* make dist changes: don't use check but checkall

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9223d049339e4e571dcdffc2c5f1f2fcdf02cd19..ad8d51d8fd97b1b46dd8736bda7792678fc2ed5e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,11 +28,11 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 2895 2005-07-04 20:38:29Z christian $
+## $Id: Makefile.am 3004 2005-07-12 19:36:10Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = codepatching kaffe native
+SUBDIRS = codepatching native
 
 EXTRA_DIST = \
        x.java x.output \
@@ -44,26 +44,20 @@ EXTRA_DIST = \
        BasicToStrings.java BasicToStrings.output \
        GCBench.java \
        JavaPerformance.java \
-       param_test.java \
-       perform_tst.sh
+       param_test.java
 
-JAVA = $(top_srcdir)/src/cacao/cacao
-JAVAC = jikes -nowarn 
+JAVA = $(top_builddir)/src/cacao/cacao
+JAVAC = jikes -nowarn
 
 checkall: x.tst jctest.tst fptest.tst fp.tst extest.tst TestArrayClasses.tst BasicToStrings.tst param_test.tst
-       echo "Testing in native/"
-       make -C native checkall
-
-checkrun: GCBench.tstrun JavaPerformance.tstrun
 
 %.tst:
        $(JAVAC) $*.java
        sh Test.sh $(JAVA) $*
 #      $(JAVA) $* > $*.thisoutput
 #      diff --brief $*.output $*.thisoutput
-       rm -f $*.thisoutput
-       rm -f $*.this2output
-        
+       $(RM) $*.thisoutput
+       $(RM) $*.this2output
 
 %.tstrun:
        $(JAVAC) $*.java

diff --git a/tests/codepatching/Makefile.am b/tests/codepatching/Makefile.am
index 192d4d33d9381ca251ff9887ac5c067c5dff1395..9512bb347414d7c30f03f29639dc3506aff7612c 100644 (file)
--- a/tests/codepatching/Makefile.am
+++ b/tests/codepatching/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 2929 2005-07-08 09:40:41Z twisti $
+## $Id: Makefile.am 3004 2005-07-12 19:36:10Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -65,13 +65,13 @@ EXTRA_DIST = \
        putstaticL.java \
        test.java
 
-JAVA = $(top_srcdir)/src/cacao/cacao
+JAVA = $(top_builddir)/src/cacao/cacao
 JAVAC = jikes -nowarn
 
 build:
        $(JAVAC) test.java
 
-check:
+checkall: build
        $(JAVA) test
 
 clean:

diff --git a/tests/native/Makefile.am b/tests/native/Makefile.am
index 0ddc2ebf350a38e37bfe415e3988a654e0bece48..99d2ec4bca28ab03e6a3db42fb8517cc322bac82 100644 (file)
--- a/tests/native/Makefile.am
+++ b/tests/native/Makefile.am
@@ -28,11 +28,11 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 2895 2005-07-04 20:38:29Z christian $
+## $Id: Makefile.am 3004 2005-07-12 19:36:10Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
 
 CLEANFILES = \
        libcheckjni.so \
@@ -43,32 +43,32 @@ CLEANFILES = \
        testarguments.class \
        testarguments.h
 
-CACAO = $(top_srcdir)/src/cacao/cacao
-CACAOC = jikes -nowarn 
-CACAOH = $(top_srcdir)/src/cacaoh/cacaoh
+JAVA = $(top_builddir)/src/cacao/cacao
+JAVAC = jikes -nowarn
+JAVAH = $(top_builddir)/src/cacaoh/cacaoh
 
 checkall: test.tst checkjni.tst testarguments.tst
+
 test:
-       $(CACAOC) test.java
-       $(CACAOH) test
+       $(JAVAC) test.java
+       $(JAVAH) test
        $(CC) -shared $(INCLUDES) $(CFLAGS) test.c -o libtest.so -fPIC
 
 checkjni:
-       $(CACAOC) checkjni.java
-       $(CACAOH) checkjni
+       $(JAVAC) checkjni.java
+       $(JAVAH) checkjni
        $(CC) -shared $(INCLUDES) $(CFLAGS) checkjni.c -o libcheckjni.so -fPIC
 
-check: testarguments
 testarguments:
-       $(CACAOC) testarguments.java
-       $(CACAOH) testarguments
+       $(JAVAC) testarguments.java
+       $(JAVAH) testarguments
        $(CC) -shared $(INCLUDES) $(CFLAGS) testarguments.c -o libtestarguments.so -fPIC
-       $(CACAOC) testgetobjectclass0.java
-       $(CACAOH) testgetobjectclass0
+       $(JAVAC) testgetobjectclass0.java
+       $(JAVAH) testgetobjectclass0
        $(CC) -shared $(INCLUDES) $(CFLAGS) testgetobjectclass0.c -o libtestgetobjectclass0.so -fPIC
 
 %.tst: %
-       sh ../Test.sh $(CACAO) $*
+       sh ../Test.sh $(JAVA) $*
        rm -f $*.thisoutput
        rm -f $*.this2output