diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9368174ba23..776cbf3e2e6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-03-27 Bryce McKinlay <bryce@albatross.co.nz> + + * Makefile.am (libffi_files): Use 'find' to pick up libffi libtool + objects in subdirectories. + * Makefile.in: Rebuilt. + 2001-03-25 Richard Henderson <rth@redhat.com> * exception.cc (java_eh_info): Make value type jthrowable. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 3b69121e8c3..60986803cb9 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -132,7 +132,7 @@ javao_files = $(java_source_files:.java=.lo) \ x_javao_files = $(x_java_source_files:.java=.lo) ## Extract the libffi object file names. -libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'` +libffi_files = `find ../libffi/ \-name '*.lo'` libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \ resolve.cc defineclass.cc interpret.cc name-finder.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index de5f24ab09e..8a172f069a5 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -181,7 +181,7 @@ javao_files = $(java_source_files:.java=.lo) \ x_javao_files = $(x_java_source_files:.java=.lo) -libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'` +libffi_files = `find ../libffi/ \-name '*.lo'` libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \ resolve.cc defineclass.cc interpret.cc name-finder.cc \ |
