aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-12-17 18:06:44 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2007-12-17 18:06:44 +0100
commitd42a3bace33aa5d49c78e7db989db863f66a1046 (patch)
tree611fd6764fbf8b772994c1db848a25bb4a8fea05
parent8085ca151e49154e25d8c38b88b688ee74dc69ba (diff)
downloadgcc-d42a3bace33aa5d49c78e7db989db863f66a1046.zip
gcc-d42a3bace33aa5d49c78e7db989db863f66a1046.tar.gz
gcc-d42a3bace33aa5d49c78e7db989db863f66a1046.tar.bz2
Makefile.am (compile-tests): Build libjava.jvmti/interp/*.h with -jni rather than -cni.
* testsuite/Makefile.am (compile-tests): Build libjava.jvmti/interp/*.h with -jni rather than -cni. * testsuite/Makefile.in: Rebuilt. From-SVN: r131010
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/testsuite/Makefile.am2
-rw-r--r--libjava/testsuite/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4c8707a..fbcf119 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-17 Jakub Jelinek <jakub@redhat.com>
+
+ * testsuite/Makefile.am (compile-tests): Build
+ libjava.jvmti/interp/*.h with -jni rather than -cni.
+ * testsuite/Makefile.in: Rebuilt.
+
2007-12-08 Andreas Tobler <a.tobler@schweiz.org>
* configure.host: Add bits for i?86-*-darwin9 and x86_64-*-darwin9.
diff --git a/libjava/testsuite/Makefile.am b/libjava/testsuite/Makefile.am
index af83ac3..fe42040 100644
--- a/libjava/testsuite/Makefile.am
+++ b/libjava/testsuite/Makefile.am
@@ -43,7 +43,7 @@ if JAVA_MAINTAINER_MODE
testdep="libjava.loader/MyLoader.java";; \
libjava.jni/register2.java) \
;; \
- libjava.jni/*.java) \
+ libjava.jni/*.java|libjava.jvmti/interp/*.java) \
genheader=-jni;; \
libjava.jvmti/*.java|libjava.cni/*.java) \
genheader=-cni;; \
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index 321d05d3..311b9d1 100644
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -558,7 +558,7 @@ compile-tests:
@JAVA_MAINTAINER_MODE_TRUE@ testdep="libjava.loader/MyLoader.java";; \
@JAVA_MAINTAINER_MODE_TRUE@ libjava.jni/register2.java) \
@JAVA_MAINTAINER_MODE_TRUE@ ;; \
-@JAVA_MAINTAINER_MODE_TRUE@ libjava.jni/*.java) \
+@JAVA_MAINTAINER_MODE_TRUE@ libjava.jni/*.java|libjava.jvmti/interp/*.java) \
@JAVA_MAINTAINER_MODE_TRUE@ genheader=-jni;; \
@JAVA_MAINTAINER_MODE_TRUE@ libjava.jvmti/*.java|libjava.cni/*.java) \
@JAVA_MAINTAINER_MODE_TRUE@ genheader=-cni;; \