projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a7bf803)
Makefile.in: Rebuilt.
authorTom Tromey <tromey@redhat.com>
Mon, 25 Sep 2006 21:06:04 +0000 (21:06 +0000)
committerTom Tromey <tromey@gcc.gnu.org>
Mon, 25 Sep 2006 21:06:04 +0000 (21:06 +0000)
* native/jni/gconf-peer/Makefile.in: Rebuilt.
* native/jni/gconf-peer/Makefile.am (libgconfpeer_la_LDFLAGS): New
variable.

From-SVN: r117210

libjava/classpath/ChangeLog.gcj patch | blob | history
libjava/classpath/native/jni/gconf-peer/Makefile.am patch | blob | history
libjava/classpath/native/jni/gconf-peer/Makefile.in patch | blob | history

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 81112e501594527f996c1b2722a943675f6ce176..91948d1fe928278a862a28e0c1aec475cb1697be 100644 (file)
--- 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 d8821832639a03f220c71350f35c1ad3d322de98..1c8c4a147ddb97814b721e3287ad01839e469a1d 100644 (file)
--- 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 3f11a6e593ee457a1ff2891b4a4e2a4269cad55c..2e95e299d6058ca3c0a7d249ab418d5854848787 100644 (file)
--- 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@