projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed jikes and
[cacao.git]
/
tests
/
regression
/
native
/
Makefile.am
diff --git
a/tests/regression/native/Makefile.am
b/tests/regression/native/Makefile.am
index d45f492c3530881a2e7fb0a2b8bdbc4937ece055..815aa4b1d8fab1157492fda59e66013118433a9d 100644
(file)
--- a/
tests/regression/native/Makefile.am
+++ b/
tests/regression/native/Makefile.am
@@
-23,17
+23,17
@@
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)
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
+JAVA = $(top_builddir)/src/cacao/cacao
+JAVAH = $(CACAOH)
if WITH_CLASSPATH_GNU
if WITH_CLASSPATH_GNU
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-JAVAHFLAGS = -bootclasspath $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
else
else
-JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
-JAVAHFLAGS = -bootclasspath $(CLASSPATH_CLASSES)
+BOOTCLASSPATH = $(CLASSPATH_CLASSES)
endif
endif
-JAVAH = $(CACAOH)
+JAVACMD = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
SOURCE_FILES = \
checkjni.java \
SOURCE_FILES = \
checkjni.java \
@@
-64,10
+64,10
@@
TESTNAMES = \
check: $(TESTNAMES)
$(TESTNAMES) $(NOTESTNAMES):
check: $(TESTNAMES)
$(TESTNAMES) $(NOTESTNAMES):
- @$(JAVAC
) -nowarn
-d . $(srcdir)/$@.java
- @$(JAVAH)
$(JAVAHFLAGS
) $@
+ @$(JAVAC
CMD)
-d . $(srcdir)/$@.java
+ @$(JAVAH)
-bootclasspath $(BOOTCLASSPATH
) $@
@$(CC) -shared $(AM_CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC
@$(CC) -shared $(AM_CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC
- @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs:. $(SHELL) $(srcdir)/../Test.sh "$(JAVA
) $(JAVAFLAGS
)" $@ $(srcdir)
+ @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs:. $(SHELL) $(srcdir)/../Test.sh "$(JAVA
CMD
)" $@ $(srcdir)
## Local variables:
## Local variables: