From da60759483fd6f3b57074738bdc03e36ea37a23e Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 25 Sep 2006 21:06:04 +0000
Subject: [PATCH] * native/jni/gconf-peer/Makefile.in: Rebuilt. *
native/jni/gconf-peer/Makefile.am (libgconfpeer_la_LDFLAGS): New
variable.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117210 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/classpath/ChangeLog.gcj | 6 ++++++
libjava/classpath/native/jni/gconf-peer/Makefile.am | 2 ++
libjava/classpath/native/jni/gconf-peer/Makefile.in | 1 +
3 files changed, 9 insertions(+)
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 81112e501594..91948d1fe928 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2006-09-25 Tom Tromey <tromey@redhat.com>
+
+ * native/jni/gconf-peer/Makefile.in: Rebuilt.
+ * native/jni/gconf-peer/Makefile.am (libgconfpeer_la_LDFLAGS): New
+ variable.
+
2006-09-25 Tom Tromey <tromey@redhat.com>
PR libgcj/29178:
diff --git a/libjava/classpath/native/jni/gconf-peer/Makefile.am b/libjava/classpath/native/jni/gconf-peer/Makefile.am
index d8821832639a..1c8c4a147ddb 100644
--- a/libjava/classpath/native/jni/gconf-peer/Makefile.am
+++ b/libjava/classpath/native/jni/gconf-peer/Makefile.am
@@ -5,6 +5,8 @@ libgconfpeer_la_SOURCES = GConfNativePeer.c
libgconfpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo
+libgconfpeer_la_LDFLAGS = -avoid-version
+
AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GDK_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
diff --git a/libjava/classpath/native/jni/gconf-peer/Makefile.in b/libjava/classpath/native/jni/gconf-peer/Makefile.in
index 3f11a6e593ee..2e95e299d605 100644
--- a/libjava/classpath/native/jni/gconf-peer/Makefile.in
+++ b/libjava/classpath/native/jni/gconf-peer/Makefile.in
@@ -313,6 +313,7 @@ libgconfpeer_la_SOURCES = GConfNativePeer.c
libgconfpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo
+libgconfpeer_la_LDFLAGS = -avoid-version
AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GDK_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@
--
GitLab