* Merged in twisti-branch.

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

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index ca2c15278e2dc23073bf5ed6637becdbd0291c91..6e56d06f3a0c746dbc688d66ff7c9fd3ea4a769f 100644 (file)
--- a/tests/regression/native/Makefile.am
+++ b/tests/regression/native/Makefile.am
@@ -26,17 +26,21 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## Changes:
-##
-## $Id: Makefile.am 5610 2006-10-01 20:27:54Z edwin $
+## $Id: Makefile.am 7360 2007-02-14 17:50:48Z tbfg $
 
 ## 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/classes/:$(CLASSPATH_GLIBJ_ZIP) -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 \
@@ -70,7 +74,7 @@ $(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: