diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-09-25 21:06:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-09-25 21:06:04 +0000 |
| commit | 3e212b0fb79c96eee46bba7fa7c7352e694098c3 (patch) | |
| tree | 835259440911299bfd05eaa8d01f737392bc5438 /libjava | |
| parent | a7bf80389a506b20280963deaa748084c20c92cb (diff) | |
| download | gcc-3e212b0fb79c96eee46bba7fa7c7352e694098c3.zip gcc-3e212b0fb79c96eee46bba7fa7c7352e694098c3.tar.gz gcc-3e212b0fb79c96eee46bba7fa7c7352e694098c3.tar.bz2 | |
Makefile.in: Rebuilt.
* native/jni/gconf-peer/Makefile.in: Rebuilt.
* native/jni/gconf-peer/Makefile.am (libgconfpeer_la_LDFLAGS): New
variable.
From-SVN: r117210
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 81112e5..91948d1 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 d882183..1c8c4a1 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 3f11a6e..2e95e29 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@ |