diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-09-25 21:06:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2006-09-25 21:06:04 +0000 |
| commit | 49fded97c879eb98edae344b39d9211e5bedc64a (patch) | |
| tree | 835259440911299bfd05eaa8d01f737392bc5438 /libjava | |
| parent | 73085620ea240429dd604521563488939db196ea (diff) | |
* native/jni/gconf-peer/Makefile.in: Rebuilt.
* native/jni/gconf-peer/Makefile.am (libgconfpeer_la_LDFLAGS): New
variable.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@117210 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 6 | ||||
| -rw-r--r-- | libjava/classpath/native/jni/gconf-peer/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/classpath/native/jni/gconf-peer/Makefile.in | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 81112e50159..91948d1fe92 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -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. diff --git a/libjava/classpath/native/jni/gconf-peer/Makefile.am b/libjava/classpath/native/jni/gconf-peer/Makefile.am index d8821832639..1c8c4a147dd 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 3f11a6e593e..2e95e299d60 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@ |