diff options
| author | Richard Henderson <rth@redhat.com> | 2005-02-15 09:17:44 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2005-02-15 09:17:44 -0800 |
| commit | bbbf49551a0b414d679cba3a24fec5513e0c78ba (patch) | |
| tree | 7b7d9402f3fe641f15b138ae6861dbfbbd1aafae /libjava/Makefile.am | |
| parent | 073aa601932174c64c4bf8654c414d96053ac4c8 (diff) | |
| download | gcc-bbbf49551a0b414d679cba3a24fec5513e0c78ba.zip gcc-bbbf49551a0b414d679cba3a24fec5513e0c78ba.tar.gz gcc-bbbf49551a0b414d679cba3a24fec5513e0c78ba.tar.bz2 | |
Makefile.am (libgcj_la_SOURCES): Move all sources ...
* Makefile.am (libgcj_la_SOURCES): Move all sources ...
(libgcj0_convenience_la_SOURCES): ... here.
(libgcj_la_LIBADD): Add libgcj0_convenience.la.
(libgcj_la_DEPENDENCIES): Include libgcj_la_LIBADD.
* Makefile.in: Regenerate.
From-SVN: r95066
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 249388e..03e3450 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -213,7 +213,11 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ +# Work around libtool wanting to do piece-wise linking with -r. Using a +# convenience library suddenly invokes the --whole-archive path instead. +# This allows the build to succeed for targets that allocate multiple got +# subsections in the linker, such as Alpha and MIPS. +libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc \ link.cc defineclass.cc interpret.cc verify.cc \ $(nat_source_files) $(math_c_source_files) $(java_source_files) \ $(gnu_xml_source_files) $(built_java_source_files) \ @@ -222,9 +226,9 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \ $(DARWIN_CRT_SRC) \ $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC) -libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \ - java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \ - $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files) +noinst_LTLIBRARIES = libgcj0_convenience.la + +libgcj_la_SOURCES = ## Objects from C++ sources in subdirs. nat_files = $(nat_source_files:.cc=.lo) @@ -239,7 +243,11 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ libgcj_la_LIBADD = \ external/sax/libsax_convenience.la \ external/w3c_dom/libw3c_convenience.la \ + libgcj0_convenience.la \ $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files) +libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \ + java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \ + $(libgcj_la_LIBADD) libgcj_la_LINK = $(LIBLINK) # Gtk/Cairo JNI sources. |