Makefile.am (libffi_files): Use 'find' to pick up libffi libtool objects in subdirect...

	* Makefile.am (libffi_files): Use 'find' to pick up libffi libtool
	objects	in subdirectories.
	* Makefile.in: Rebuilt.

From-SVN: r40857

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9368174ba23c5a964da1b9b573a15530185c016f..776cbf3e2e6de6f0011f9779e335a229963d6c68 100644 (file)
--- 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 3b69121e8c3a0e068212434968d541866564cd03..60986803cb904a1a3fdcec438d15135114754c02 100644 (file)
--- 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 de5f24ab09e3b82d483f308c28f5c3c86d580e5d..8a172f069a58d09ed39f7f003a7720a2dfed6083 100644 (file)
--- 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 \