diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-16 01:27:14 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-16 01:27:14 +0000 |
| commit | a63c2657c94913d72b3cd388730d61edcb09fc69 (patch) | |
| tree | 8762d1f992e2f725a6bde1ff966ed6f1e5f4f823 /libjava/testsuite/libjava.jni/jni.exp | |
| parent | 6484dceb0094998183c2f8d3c8c27c6f4e53b8a9 (diff) | |
| download | ppe42-gcc-a63c2657c94913d72b3cd388730d61edcb09fc69.tar.gz ppe42-gcc-a63c2657c94913d72b3cd388730d61edcb09fc69.zip | |
Major merge with Classpath.
Removed many duplicate files.
* HACKING: Updated.x
* classpath: Imported new directory.
* standard.omit: New file.
* Makefile.in, aclocal.m4, configure: Rebuilt.
* sources.am: New file.
* configure.ac: Run Classpath configure script. Moved code around
to support. Disable xlib AWT peers (temporarily).
* Makefile.am (SUBDIRS): Added 'classpath'
(JAVAC): Removed.
(AM_CPPFLAGS): Added more -I options.
(BOOTCLASSPATH): Simplified.
Completely redid how sources are built.
Include sources.am.
* include/Makefile.am (tool_include__HEADERS): Removed jni.h.
* include/jni.h: Removed (in Classpath).
* scripts/classes.pl: Updated to look at built classes.
* scripts/makemake.tcl: New file.
* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added
-I options.
(gcj_jni_invocation_compile_c_to_binary): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102082 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/libjava.jni/jni.exp')
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 8 |
1 files changed, 4 insertions, 4 deletions
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" |
