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/classpath/native/jawt | |
| 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/classpath/native/jawt')
| -rw-r--r-- | libjava/classpath/native/jawt/Makefile.am | 1 | ||||
| -rw-r--r-- | libjava/classpath/native/jawt/Makefile.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libjava/classpath/native/jawt/Makefile.am b/libjava/classpath/native/jawt/Makefile.am index 01abf3b..c81e754 100644 --- a/libjava/classpath/native/jawt/Makefile.am +++ b/libjava/classpath/native/jawt/Makefile.am @@ -2,6 +2,7 @@ nativeexeclib_LTLIBRARIES = libjawt.la libjawt_la_SOURCES = jawt.c libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la +libjawt_la_LDFLAGS = -avoid-version AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ diff --git a/libjava/classpath/native/jawt/Makefile.in b/libjava/classpath/native/jawt/Makefile.in index 683bbb9d..4a15a20 100644 --- a/libjava/classpath/native/jawt/Makefile.in +++ b/libjava/classpath/native/jawt/Makefile.in @@ -298,6 +298,7 @@ vm_classes = @vm_classes@ nativeexeclib_LTLIBRARIES = libjawt.la libjawt_la_SOURCES = jawt.c libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la +libjawt_la_LDFLAGS = -avoid-version AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ |