[kaffe] CVS kaffe (robilad): Merged in plugin fix for automake 1.10 LDFLAGS issue from GNU Classpath,

[Kaffe CVS]

PatchSet 7506 
Date: 2007/08/06 12:13:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-08-06  Dalibor Topic  <robilad at kaffe.org>

        Merged in plugin fix for automake 1.10 LDFLAGS issue from GNU Classpath,
        and regenerated generated files.

        * libraries/javalib/external/classpath/native/plugin/Makefile.am,
        libraries/javalib/external/classpath/native/plugin/Makefile.in:

        2007-04-16  Dalibor Topic  <robilad at kaffe.org>

                 * native/plugin/Makefile.am (libgcjwebplugin_la_LDFLAGS):
                 Added AM_LDFLAGS for automake 1.10.

Members: 
	ChangeLog:1.5004->1.5005 
	libraries/javalib/external/classpath/native/plugin/Makefile.am:1.4->1.5 
	libraries/javalib/external/classpath/native/plugin/Makefile.in:1.11->1.12 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5004 kaffe/ChangeLog:1.5005
--- kaffe/ChangeLog:1.5004	Mon Aug  6 11:51:46 2007
+++ kaffe/ChangeLog	Mon Aug  6 12:13:20 2007
@@ -1,26 +1,39 @@
 2007-08-06  Dalibor Topic  <robilad at kaffe.org>
 
+	Merged in plugin fix for automake 1.10 LDFLAGS issue from GNU Classpath,
+	and regenerated generated files.
+
+	* libraries/javalib/external/classpath/native/plugin/Makefile.am,
+	libraries/javalib/external/classpath/native/plugin/Makefile.in:
+
+	2007-04-16  Dalibor Topic  <robilad at kaffe.org>
+
+	         * native/plugin/Makefile.am (libgcjwebplugin_la_LDFLAGS):
+	         Added AM_LDFLAGS for automake 1.10.
+
+2007-08-06  Dalibor Topic  <robilad at kaffe.org>
+
 	Merged in Mark's fix for automake 1.10 LDFLAGS issue from GNU Classpath,
 	and regenerated generated files. This fixes the GNU Classpath gtk peers.
 
-	* libraries/javalib/external/classpath/aclocal.m4
-	libraries/javalib/external/classpath/autogen.sh
-	libraries/javalib/external/classpath/config.guess
-	libraries/javalib/external/classpath/config.sub
-	libraries/javalib/external/classpath/configure
-	libraries/javalib/external/classpath/configure.ac
-	libraries/javalib/external/classpath/ltmain.sh
-	libraries/javalib/external/classpath/native/jawt/Makefile.am
-	libraries/javalib/external/classpath/native/jawt/Makefile.in
-	libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.am
-	libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.in
-	libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.am
-	libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in
-	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am
-	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in
-	libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.am
-	libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in
-	libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.am
+	* libraries/javalib/external/classpath/aclocal.m4,
+	libraries/javalib/external/classpath/autogen.sh,
+	libraries/javalib/external/classpath/config.guess,
+	libraries/javalib/external/classpath/config.sub,
+	libraries/javalib/external/classpath/configure,
+	libraries/javalib/external/classpath/configure.ac,
+	libraries/javalib/external/classpath/ltmain.sh,
+	libraries/javalib/external/classpath/native/jawt/Makefile.am,
+	libraries/javalib/external/classpath/native/jawt/Makefile.in,
+	libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.am,
+	libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.in,
+	libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.am,
+	libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in,
+	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am,
+	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in,
+	libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.am,
+	libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in,
+	libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.am,
 	libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:
 
 	 2007-04-05  Mark Wielaard  <mark at klomp.org>
Index: kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.am
diff -u kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.am:1.4 kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.am:1.5
--- kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.am:1.4	Fri Dec  8 01:57:54 2006
+++ kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.am	Mon Aug  6 12:13:21 2007
@@ -8,7 +8,7 @@
 
 libgcjwebplugin_la_LDFLAGS = -avoid-version \
 	$(GLIB_LIBS) $(GTK_LIBS) \
-	-lstdc++
+	-lstdc++ $(AM_LDFLAGS)
 
 install-plugin: $(nativeexeclib_LTLIBRARIES)
 	$(INSTALL) -d -m0755 $(DESTDIR)$(PLUGIN_DIR)
Index: kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.in
diff -u kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.in:1.11 kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.in:1.12
--- kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.in:1.11	Sun Jan  7 22:14:47 2007
+++ kaffe/libraries/javalib/external/classpath/native/plugin/Makefile.in	Mon Aug  6 12:13:21 2007
@@ -271,7 +271,7 @@
 
 libgcjwebplugin_la_LDFLAGS = -avoid-version \
 	$(GLIB_LIBS) $(GTK_LIBS) \
-	-lstdc++
+	-lstdc++ $(AM_LDFLAGS)
 
 all: all-am