diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-07-31 16:34:28 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2006-07-31 16:34:28 +0000 |
| commit | 5fa432a2bc525788ec94e6e26689a66e23c511ba (patch) | |
| tree | fae72aa414a6c70b12759bfbe2154aedaf84a0e7 /libjava/Makefile.am | |
| parent | c12690236aac5b02fbc70d5dc51fa9ee6d5aba7c (diff) | |
| download | gcc-5fa432a2bc525788ec94e6e26689a66e23c511ba.zip gcc-5fa432a2bc525788ec94e6e26689a66e23c511ba.tar.gz gcc-5fa432a2bc525788ec94e6e26689a66e23c511ba.tar.bz2 | |
re PR libgcj/28312 (peer libraries are installed into gcjversionedlibdir, not into nativeexeclib)
2006-07-31 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/28312
* classpath/native/jni/midi-alsa/Makefile.am
(libgjsmalsa_la_LDFLAGS): Add -avoid-version.
* classpath/native/jni/midi-alsa/Makefile.in: Regenerate.
* classpath/native/jni/midi-dssi/Makefile.am
(libgjsmdssi_la_LDFLAGS): Add -avoid-version.
* classpath/native/jni/midi-dssi/Makefile.in: Regenerate.
* classpath/native/jni/qt-peer/Makefile.am: Remove GCJ LOCAL
sections.
(libqtpeer_la_LDFLAGS): Add -avoid-version.
* classpath/native/jni/qt-peer/Makefile.in: Regenerate.
* classpath/native/jni/gtk-peer/Makefile.am
(libgtkpeer_la_LDFLAGS): Add -avoid-version.
* classpath/native/jni/gtk-peer/Makefile.in: Regenerate.
* classpath/native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add
-avoid-version.
* classpath/native/jawt/Makefile.in: Regenerate.
* Makefile.am (libjvm_la_LDFLAGS): Add -avoid-version.
* Makefile.in: Regenerate.
From-SVN: r115839
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 45a49303..54ab516 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -247,9 +247,7 @@ libjvm_la_SOURCES = jni-libjvm.cc libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec ## See jv_convert_LDADD. libjvm_la_LIBADD = -L$(here)/.libs libgcj.la -## The mysterious backslash in the grep pattern is consumed by make. -libjvm_la_LDFLAGS = \ - -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) +libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC) ## The .db file. This rule is only used for native builds, so it is ## safe to invoke gcj-dbtool. |