diff options
Diffstat (limited to 'libjava/testsuite')
| -rw-r--r-- | libjava/testsuite/Makefile.in | 8 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index d3ddabf352f..f0e3b25af43 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.3 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,14 +40,12 @@ subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ - $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/gxx-include-dir.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lcmessage.m4 \ - $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lib-ld.m4 \ $(top_srcdir)/../config/lib-link.m4 \ - $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \ + $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 84614260b0b..aa993b33127 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -36,8 +36,8 @@ proc gcj_jni_compile_c_to_so {file {options {}}} { lappend options "additional_flags=-Wmissing-prototypes" } - # Find jni.h. - lappend options "additional_flags=-I$srcdir/../include" + # Find jni.h and jni_md.h. + lappend options "additional_flags=-I$srcdir/../include -I$srcdir/../classpath/include" # Append C++ options lappend options "additional_flags=$options_cxx" @@ -201,8 +201,8 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { # Find the generated header. lappend options "additional_flags=-I. -I.." - # Find jni.h. - lappend options "additional_flags=-I$srcdir/../include" + # Find jni.h and jni_md.h. + lappend options "additional_flags=-I$srcdir/../include -I$srcdir/../classpath/include" # Append C++ options lappend options "additional_flags=$options_cxx" |
