Move GDK_DEP_LIBS from LDFLAGS to each of the libgdk_*_LIBADD, to fix

2002-08-21  Tor Lillqvist  <tml@iki.fi>

	* gdk/Makefile.am: Move GDK_DEP_LIBS from LDFLAGS to each of the
	libgdk_*_LIBADD, to fix problems when cross-compiling, as
	suggested by J. Ali Harlow in #87103.

diff --git a/ChangeLog b/ChangeLog
index 2b124b67f87e4868df237e80c36ba88fd4a77ddf..9c3fbad82400f59f4789ad55eae9e1b5f89adf95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/Makefile.am: Move GDK_DEP_LIBS from LDFLAGS to each of the
+       libgdk_*_LIBADD, to fix problems when cross-compiling, as
+       suggested by J. Ali Harlow in #87103.
+
 2002-08-19  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkentry.c (gtk_entry_real_delete_text): Use 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2b124b67f87e4868df237e80c36ba88fd4a77ddf..9c3fbad82400f59f4789ad55eae9e1b5f89adf95 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-08-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/Makefile.am: Move GDK_DEP_LIBS from LDFLAGS to each of the
+       libgdk_*_LIBADD, to fix problems when cross-compiling, as
+       suggested by J. Ali Harlow in #87103.
+
 2002-08-19  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkentry.c (gtk_entry_real_delete_text): Use 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2b124b67f87e4868df237e80c36ba88fd4a77ddf..9c3fbad82400f59f4789ad55eae9e1b5f89adf95 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-08-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/Makefile.am: Move GDK_DEP_LIBS from LDFLAGS to each of the
+       libgdk_*_LIBADD, to fix problems when cross-compiling, as
+       suggested by J. Ali Harlow in #87103.
+
 2002-08-19  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkentry.c (gtk_entry_real_delete_text): Use 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2b124b67f87e4868df237e80c36ba88fd4a77ddf..9c3fbad82400f59f4789ad55eae9e1b5f89adf95 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-08-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/Makefile.am: Move GDK_DEP_LIBS from LDFLAGS to each of the
+       libgdk_*_LIBADD, to fix problems when cross-compiling, as
+       suggested by J. Ali Harlow in #87103.
+
 2002-08-19  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkentry.c (gtk_entry_real_delete_text): Use 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2b124b67f87e4868df237e80c36ba88fd4a77ddf..9c3fbad82400f59f4789ad55eae9e1b5f89adf95 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-08-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/Makefile.am: Move GDK_DEP_LIBS from LDFLAGS to each of the
+       libgdk_*_LIBADD, to fix problems when cross-compiling, as
+       suggested by J. Ali Harlow in #87103.
+
 2002-08-19  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkentry.c (gtk_entry_real_delete_text): Use 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2b124b67f87e4868df237e80c36ba88fd4a77ddf..9c3fbad82400f59f4789ad55eae9e1b5f89adf95 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-08-21  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/Makefile.am: Move GDK_DEP_LIBS from LDFLAGS to each of the
+       libgdk_*_LIBADD, to fix problems when cross-compiling, as
+       suggested by J. Ali Harlow in #87103.
+
 2002-08-19  Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtkentry.c (gtk_entry_real_delete_text): Use 

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 1d4181f5ac8fb25f508fd7015166b59d562adc5d..118cac0bf1c39b98419d4560b3db83c441195f3c 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -77,7 +77,6 @@ LDFLAGS = @STRIP_BEGIN@                                               \
        @LIBTOOL_EXPORT_OPTIONS@                                        \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(gdk_win32_symbols)                                            \
-       @GDK_DEP_LIBS@                                                  \
 @STRIP_END@
 
 #
@@ -167,10 +166,11 @@ libgdk_x11_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c gdkmarshalers.h # gd
 libgdk_linux_fb_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c gdkmarshalers.h # gdkmarshalers.c
 libgdk_win32_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c # gdkmarshalers.c
 
-libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la   
-libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la    
+libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la @GDK_DEP_LIBS@
+libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la @GDK_DEP_LIBS@
 libgdk_win32_2_0_la_LIBADD = \
-       win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib)
+       win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib) \
+       @GDK_DEP_LIBS@
 
 lib_LTLIBRARIES = $(gdktargetlib)