libjava Makefile.am: Fix libffi linking

Bryce McKinlay bryce@albatross.co.nz
Mon Mar 26 16:16:00 GMT 2001


I'm checking this in. Since the libffi object files are now in
subdirectories, the libjava build (which refers to them
directly) broke. Ideally, libffi would be a convenience library or
something so we can link it without having to reference its .lo files
directly, but this seems to be the easiest fix.

regards

  [ bryce ]


2001-03-27  Bryce McKinlay  <bryce@albatross.co.nz>

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

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.129.2.4
diff -u -r1.129.2.4 Makefile.am
--- Makefile.am 2001/03/23 05:17:06     1.129.2.4
+++ Makefile.am 2001/03/27 00:12:16
@@ -132,7 +132,7 @@
 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 \





More information about the Java-patches mailing list