* Removed all Id tags.

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

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index 590f931eac6199162b1d68aaf7848b3d769ab19c..408a13e49105237cb1a0dfea5e5a7a062b71cd18 100644 (file)
--- a/tests/regression/native/Makefile.am
+++ b/tests/regression/native/Makefile.am
@@ -25,18 +25,19 @@
 ## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 4628 2006-03-16 13:56:34Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)
 
 JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/$(VM_ZIP_STRING):$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING) -Djava.library.path=.
-JAVAH     = $(top_builddir)/src/cacaoh/cacaoh
+
+if WITH_CLASSPATH_GNU
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+else
+JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+endif
+
+JAVAH     = @CACAOH@
 
 SOURCE_FILES = \
        checkjni.java \
@@ -57,17 +58,20 @@ CLEANFILES = \
        *.thisoutput \
        *.this2output
 
+NOTESTNAMES = \
+       test
+
 TESTNAMES = \
        checkjni \
        testarguments
 
 check: $(TESTNAMES)
 
-$(TESTNAMES):
-       @$(JAVAC) -d . $(srcdir)/$@.java
+$(TESTNAMES) $(NOTESTNAMES):
+       @$(JAVAC) -nowarn -d . $(srcdir)/$@.java
        @$(JAVAH) $@
        @$(CC) -shared $(AM_CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC
-       @$(SHELL) $(srcdir)/../Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs:. $(SHELL) $(srcdir)/../Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir)
 
 
 ## Local variables: