Merged revisions 7501-7598 via svnmerge from

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

diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am
index 53ed06c45ca863f5b3e665c32290dd1c761b417c..ece0e5ba84647d001073ee4c694c7d95a55a3b52 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 5404 2006-09-07 13:29:05Z christian $
+## $Id: Makefile.am 7596 2007-03-28 21:05:53Z 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/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: