OSDN Git Service

* native/jni/gconf-peer/Makefile.in: Rebuilt.
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 25 Sep 2006 21:06:04 +0000 (21:06 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 25 Sep 2006 21:06:04 +0000 (21:06 +0000)
* 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
libjava/classpath/native/jni/gconf-peer/Makefile.am
libjava/classpath/native/jni/gconf-peer/Makefile.in

index 81112e5..91948d1 100644 (file)
@@ -1,5 +1,11 @@
 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:
        * gnu/java/nio/charset/US_ASCII.java (Encoder.canEncode): New method.
        (Encoder.canEncode): Likewise.
index d882183..1c8c4a1 100644 (file)
@@ -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@
index 3f11a6e..2e95e29 100644 (file)
@@ -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@