# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1159726669 0
# Node ID 69590c55c74857d8ae8a6776e194b3261dd48bf0
# Parent  a2b56d168a88b16233a5927e392a4c250f81409f
[gaim-migrate @ 17420]
It is more correct to use foo_la_LIBADD to specify libs to link to instead
of foo_la_LDFLAGS

committer: Tailor Script <tailor@pidgin.im>

diff -r a2b56d168a88 -r 69590c55c748 console/libgnt/wms/Makefile.am
--- a/console/libgnt/wms/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/console/libgnt/wms/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -1,11 +1,12 @@
-s_la_LDFLAGS             = -module -avoid-version $(GLIB_LIBS) $(GNT_LIBS)
+s_la_LDFLAGS             = -module -avoid-version
 
 plugin_LTLIBRARIES = \
 	s.la
 
 plugindir = $(libdir)/gaim
 
-s_la_SOURCES             = s.c
+s_la_SOURCES       = s.c
+s_la_LIBADD        = $(GLIB_LIBS) $(top_builddir)/console/libgnt/libgnt.la
 
 EXTRA_DIST = 
 
diff -r a2b56d168a88 -r 69590c55c748 console/plugins/Makefile.am
--- a/console/plugins/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/console/plugins/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -1,5 +1,5 @@
-gntgf_la_LDFLAGS      = -module -avoid-version $(GLIB_LIBS) $(X11_LIBS) $(GNT_LIBS)
-gnthistory_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+gntgf_la_LDFLAGS      = -module -avoid-version
+gnthistory_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
@@ -12,6 +12,9 @@
 gntgf_la_SOURCES      = gntgf.c
 gnthistory_la_SOURCES = gnthistory.c
 
+gntgf_la_LIBADD       = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/console/libgnt/libgnt.la
+gnthistory_la_LIBADD  = $(GLIB_LIBS)
+
 endif # PLUGINS
 
 EXTRA_DIST = 
diff -r a2b56d168a88 -r 69590c55c748 gtk/plugins/Makefile.am
--- a/gtk/plugins/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/gtk/plugins/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -27,15 +27,15 @@
 
 plugindir = $(libdir)/gaim
 
-extplacement_la_LDFLAGS     = -module -avoid-version $(GTK_LIBS)
-gaimrc_la_LDFLAGS           = -module -avoid-version $(GTK_LIBS)
-history_la_LDFLAGS          = -module -avoid-version $(GTK_LIBS)
-iconaway_la_LDFLAGS         = -module -avoid-version $(GTK_LIBS)
-notify_la_LDFLAGS           = -module -avoid-version $(GTK_LIBS)
-relnot_la_LDFLAGS           = -module -avoid-version $(GLIB_LIBS)
-spellchk_la_LDFLAGS         = -module -avoid-version $(GTK_LIBS)
-timestamp_la_LDFLAGS        = -module -avoid-version $(GTK_LIBS)
-timestamp_format_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+extplacement_la_LDFLAGS     = -module -avoid-version
+gaimrc_la_LDFLAGS           = -module -avoid-version
+history_la_LDFLAGS          = -module -avoid-version
+iconaway_la_LDFLAGS         = -module -avoid-version
+notify_la_LDFLAGS           = -module -avoid-version
+relnot_la_LDFLAGS           = -module -avoid-version
+spellchk_la_LDFLAGS         = -module -avoid-version
+timestamp_la_LDFLAGS        = -module -avoid-version
+timestamp_format_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
@@ -61,6 +61,16 @@
 timestamp_la_SOURCES        = timestamp.c
 timestamp_format_la_SOURCES = timestamp_format.c
 
+extplacement_la_LIBADD      = $(GTK_LIBS)
+gaimrc_la_LIBADD            = $(GTK_LIBS)
+history_la_LIBADD           = $(GTK_LIBS)
+iconaway_la_LIBADD          = $(GTK_LIBS)
+notify_la_LIBADD            = $(GTK_LIBS)
+relnot_la_LIBADD            = $(GLIB_LIBS)
+spellchk_la_LIBADD          = $(GTK_LIBS)
+timestamp_la_LIBADD         = $(GTK_LIBS)
+timestamp_format_la_LIBADD  = $(GTK_LIBS)
+
 endif # PLUGINS
 
 EXTRA_DIST = \
diff -r a2b56d168a88 -r 69590c55c748 gtk/plugins/cap/Makefile.am
--- a/gtk/plugins/cap/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/gtk/plugins/cap/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -1,6 +1,6 @@
 capdir = $(libdir)/gaim
 
-cap_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+cap_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
@@ -15,7 +15,7 @@
 
 endif
 
-cap_la_LIBADD = $(SQLITE3_LIBS)
+cap_la_LIBADD = $(GTK_LIBS) $(SQLITE3_LIBS)
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
diff -r a2b56d168a88 -r 69590c55c748 gtk/plugins/docklet/Makefile.am
--- a/gtk/plugins/docklet/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/gtk/plugins/docklet/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -6,7 +6,7 @@
 
 plugindir = $(libdir)/gaim
 
-docklet_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+docklet_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
@@ -19,6 +19,8 @@
 	docklet.c \
 	docklet-x11.c
 
+docklet_la_LIBADD = $(GTK_LIBS)
+
 endif
 
 AM_CPPFLAGS = \
diff -r a2b56d168a88 -r 69590c55c748 gtk/plugins/gestures/Makefile.am
--- a/gtk/plugins/gestures/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/gtk/plugins/gestures/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -1,6 +1,6 @@
 plugindir = $(libdir)/gaim
 
-gestures_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+gestures_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
@@ -13,6 +13,8 @@
 	stroke.c \
 	stroke-draw.c
 
+gestures_la_LIBADD = $(GTK_LIBS)
+
 endif
 
 AM_CPPFLAGS = \
diff -r a2b56d168a88 -r 69590c55c748 gtk/plugins/gevolution/Makefile.am
--- a/gtk/plugins/gevolution/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/gtk/plugins/gevolution/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -1,9 +1,6 @@
 plugindir = $(libdir)/gaim
 
-gevolution_la_LDFLAGS = \
-	-module -avoid-version \
-	$(EVOLUTION_ADDRESSBOOK_LIBS) \
-	$(GTK_LIBS)
+gevolution_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
@@ -18,9 +15,9 @@
 	new_person_dialog.c \
 	eds-utils.c
 
-endif
+gevolution_la_LIBADD = $(EVOLUTION_ADDRESSBOOK_LIBS) $(GTK_LIBS)
 
-gevolution_la_LIBADD = 
+endif
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
diff -r a2b56d168a88 -r 69590c55c748 gtk/plugins/musicmessaging/Makefile.am
--- a/gtk/plugins/musicmessaging/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/gtk/plugins/musicmessaging/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -3,7 +3,7 @@
 
 musicmessagingdir = $(libdir)/gaim
 
-musicmessaging_la_LDFLAGS = -module -avoid-version $(GTK_LIBS) $(DBUS_LIBS)
+musicmessaging_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 if ENABLE_DBUS
@@ -16,7 +16,7 @@
 musicmessaging_la_SOURCES = \
 	musicmessaging.c
 
-
+musicmessaging_la_LIBADD = $(GTK_LIBS) $(DBUS_LIBS)
 
 CLEANFILES              = music-messaging-bindings.c
 
diff -r a2b56d168a88 -r 69590c55c748 gtk/plugins/ticker/Makefile.am
--- a/gtk/plugins/ticker/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/gtk/plugins/ticker/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -3,7 +3,7 @@
 
 plugindir = $(libdir)/gaim
 
-ticker_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+ticker_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 
@@ -14,6 +14,8 @@
 	gtkticker.h \
 	ticker.c
 
+ticker_la_LIBADD = $(GTK_LIBS)
+
 endif
 
 AM_CPPFLAGS = \
diff -r a2b56d168a88 -r 69590c55c748 libgaim/plugins/Makefile.am
--- a/libgaim/plugins/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/plugins/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -24,13 +24,13 @@
 
 plugindir = $(libdir)/gaim
 
-idle_la_LDFLAGS             = -module -avoid-version $(GLIB_LIBS)
-log_reader_la_LDFLAGS       = -module -avoid-version $(GLIB_LIBS)
-psychic_la_LDFLAGS          = -module -avoid-version $(GLIB_LIBS)
-statenotify_la_LDFLAGS      = -module -avoid-version $(GLIB_LIBS)
+idle_la_LDFLAGS             = -module -avoid-version
+log_reader_la_LDFLAGS       = -module -avoid-version
+psychic_la_LDFLAGS          = -module -avoid-version
+statenotify_la_LDFLAGS      = -module -avoid-version
 
 # this can't be in a conditional otherwise automake 1.4 yells
-dbus_example_la_LDFLAGS     = -module -avoid-version $(GLIB_LIBS) $(DBUS_LIBS)
+dbus_example_la_LDFLAGS     = -module -avoid-version
 
 if PLUGINS
 
@@ -47,11 +47,18 @@
 psychic_la_SOURCES          = psychic.c
 statenotify_la_SOURCES      = statenotify.c
 
+idle_la_LIBADD              = $(GLIB_LIBS)
+log_reader_la_LIBADD        = $(GLIB_LIBS)
+psychic_la_LIBADD           = $(GLIB_LIBS)
+statenotify_la_LIBADD       = $(GLIB_LIBS)
+
 if ENABLE_DBUS
 
 CLEANFILES              = dbus-example-bindings.c
 dbus_example_la_SOURCES = dbus-example.c
 
+dbus_example_la_LIBADD      = $(GLIB_LIBS) $(DBUS_LIBS)
+
 .PHONY: always
 
 $(top_builddir)/libgaim/dbus-types.h: always
diff -r a2b56d168a88 -r 69590c55c748 libgaim/plugins/perl/Makefile.am
--- a/libgaim/plugins/perl/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/plugins/perl/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -1,11 +1,13 @@
 plugindir = $(libdir)/gaim
+hackdir = $(plugindir)/private
 
 perl_dirs = common
 
-plugin_LTLIBRARIES = perl.la libgaimperl.la
+plugin_LTLIBRARIES = perl.la
+hack_LTLIBRARIES = libgaimperl.la
 
-perl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) $(PERL_LIBS)
-perl_la_LIBADD = $(PERL_LIBS) -L. -L.libs -lgaimperl
+perl_la_LDFLAGS = -module -avoid-version
+perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS) libgaimperl.la
 perl_la_SOURCES = \
 	perl.c \
 	perl-common.c \
@@ -18,7 +20,8 @@
 	.libs/DynaLoader.a \
 	libgaimperl.la
 
-libgaimperl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libgaimperl_la_LDFLAGS = -module -avoid-version
+libgaimperl_la_LIBADD = $(GLIB_LIBS)
 libgaimperl_la_SOURCES = libgaimperl.c
 
 .libs/libperl_orig.a:
diff -r a2b56d168a88 -r 69590c55c748 libgaim/plugins/ssl/Makefile.am
--- a/libgaim/plugins/ssl/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/plugins/ssl/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -3,9 +3,9 @@
 
 plugindir = $(libdir)/gaim
 
-ssl_la_LDFLAGS        = -module -avoid-version $(GLIB_LIBS)
-ssl_gnutls_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
-ssl_nss_la_LDFLAGS    = -module -avoid-version $(GLIB_LIBS)
+ssl_la_LDFLAGS        = -module -avoid-version
+ssl_gnutls_la_LDFLAGS = -module -avoid-version
+ssl_nss_la_LDFLAGS    = -module -avoid-version
 
 if PLUGINS
 
@@ -18,8 +18,9 @@
 ssl_gnutls_la_SOURCES = ssl-gnutls.c
 ssl_nss_la_SOURCES    = ssl-nss.c
 
-ssl_gnutls_la_LIBADD = $(GNUTLS_LIBS)
-ssl_nss_la_LIBADD    = $(NSS_LIBS)
+ssl_la_LIBADD        = $(GLIB_LIBS)
+ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
+ssl_nss_la_LIBADD    = $(GLIB_LIBS) $(NSS_LIBS)
 
 endif # PLUGINS
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/plugins/tcl/Makefile.am
--- a/libgaim/plugins/tcl/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/plugins/tcl/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -1,12 +1,14 @@
 plugindir = $(libdir)/gaim
 
-tcl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) $(TCL_LIBS) $(TK_LIBS)
+tcl_la_LDFLAGS = -module -avoid-version
 
 plugin_LTLIBRARIES = tcl.la
 
 tcl_la_SOURCES = tcl.c tcl_glib.c tcl_glib.h tcl_cmds.c tcl_signals.c tcl_gaim.h \
                  tcl_ref.c tcl_cmd.c
 
+tcl_la_LIBADD = $(GLIB_LIBS) $(TCL_LIBS) $(TK_LIBS)
+
 EXTRA_DIST = signal-test.tcl Makefile.mingw
 
 AM_CPPFLAGS = \
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/bonjour/Makefile.am
--- a/libgaim/protocols/bonjour/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/bonjour/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -15,7 +15,7 @@
 
 AM_CFLAGS = $(st)
 
-libbonjour_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) $(HOWL_LIBS)
+libbonjour_la_LDFLAGS = -module -avoid-version
 
 if STATIC_BONJOUR
 
@@ -30,6 +30,7 @@
 st =
 pkg_LTLIBRARIES       = libbonjour.la
 libbonjour_la_SOURCES = $(BONJOURSOURCES)
+libbonjour_la_LIBADD   = $(GLIB_LIBS) $(HOWL_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/gg/Makefile.am
--- a/libgaim/protocols/gg/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/gg/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -47,7 +47,7 @@
 
 AM_CFLAGS = $(st)
 
-libgg_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libgg_la_LDFLAGS = -module -avoid-version
 
 if STATIC_GG
 
@@ -66,7 +66,7 @@
 noinst_LIBRARIES =
 
 libgg_la_SOURCES = $(GGSOURCES)
-libgg_la_LIBADD  = $(GADU_LIBS)
+libgg_la_LIBADD  = $(GLIB_LIBS) $(GADU_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/irc/Makefile.am
--- a/libgaim/protocols/irc/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/irc/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -6,7 +6,7 @@
 
 AM_CFLAGS = $(st)
 
-libirc_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libirc_la_LDFLAGS = -module -avoid-version
 
 if STATIC_IRC
 
@@ -24,6 +24,7 @@
 noinst_LIBRARIES =
 
 libirc_la_SOURCES = $(IRCSOURCES)
+libirc_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/jabber/Makefile.am
--- a/libgaim/protocols/jabber/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/jabber/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -36,7 +36,7 @@
 
 AM_CFLAGS = $(st)
 
-libjabber_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS)
+libjabber_la_LDFLAGS = -module -avoid-version
 
 if STATIC_JABBER
 
@@ -54,6 +54,7 @@
 noinst_LIBRARIES =
 
 libjabber_la_SOURCES = $(JABBERSOURCES)
+libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/msn/Makefile.am
--- a/libgaim/protocols/msn/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/msn/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -65,7 +65,7 @@
 
 AM_CFLAGS = $(st)
 
-libmsn_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libmsn_la_LDFLAGS = -module -avoid-version
 
 if STATIC_MSN
 
@@ -79,6 +79,7 @@
 st =
 pkg_LTLIBRARIES   = libmsn.la
 libmsn_la_SOURCES = $(MSNSOURCES)
+libmsn_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/novell/Makefile.am
--- a/libgaim/protocols/novell/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/novell/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -28,7 +28,7 @@
 
 AM_CFLAGS = $(st)
 
-libnovell_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libnovell_la_LDFLAGS = -module -avoid-version
 
 if STATIC_NOVELL
 
@@ -46,6 +46,7 @@
 noinst_LIBRARIES =
 
 libnovell_la_SOURCES = $(NOVELLSOURCES)
+libnovell_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/oscar/Makefile.am
--- a/libgaim/protocols/oscar/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/oscar/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -46,7 +46,7 @@
 
 AM_CFLAGS = $(st)
 
-liboscar_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+liboscar_la_LDFLAGS = -module -avoid-version
 
 if STATIC_OSCAR
 
@@ -60,6 +60,7 @@
 st =
 pkg_LTLIBRARIES     = liboscar.la
 liboscar_la_SOURCES = $(OSCARSOURCES)
+liboscar_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/qq/Makefile.am
--- a/libgaim/protocols/qq/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/qq/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -73,7 +73,7 @@
 
 AM_CFLAGS = $(st)
 
-libqq_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libqq_la_LDFLAGS = -module -avoid-version
 
 if STATIC_QQ
 
@@ -87,6 +87,7 @@
 st =
 pkg_LTLIBRARIES  = libqq.la
 libqq_la_SOURCES = $(QQSOURCES)
+libqq_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/silc/Makefile.am
--- a/libgaim/protocols/silc/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/silc/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -6,7 +6,7 @@
 
 AM_CFLAGS = $(st)
 
-libsilcgaim_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libsilcgaim_la_LDFLAGS = -module -avoid-version
 
 if STATIC_SILC
 
@@ -25,7 +25,7 @@
 noinst_LIBRARIES =
 
 libsilcgaim_la_SOURCES = $(SILCSOURCES)
-libsilcgaim_la_LIBADD  = $(SILC_LIBS)
+libsilcgaim_la_LIBADD  = $(GLIB_LIBS) $(SILC_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/simple/Makefile.am
--- a/libgaim/protocols/simple/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/simple/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -11,7 +11,7 @@
 
 AM_CFLAGS = $(st) 
 
-libsimple_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libsimple_la_LDFLAGS = -module -avoid-version
 
 if STATIC_MSN
 
@@ -25,6 +25,7 @@
 st =
 pkg_LTLIBRARIES   = libsimple.la
 libsimple_la_SOURCES = $(SIMPLESOURCES)
+libsimple_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/yahoo/Makefile.am
--- a/libgaim/protocols/yahoo/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/yahoo/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -29,7 +29,7 @@
 
 AM_CFLAGS = $(st)
 
-libyahoo_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libyahoo_la_LDFLAGS = -module -avoid-version
 
 if STATIC_YAHOO
 
@@ -43,6 +43,7 @@
 st =
 pkg_LTLIBRARIES     = libyahoo.la
 libyahoo_la_SOURCES = $(YAHOOSOURCES)
+libyahoo_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
diff -r a2b56d168a88 -r 69590c55c748 libgaim/protocols/zephyr/Makefile.am
--- a/libgaim/protocols/zephyr/Makefile.am	Sun Oct 01 16:33:14 2006 +0000
+++ b/libgaim/protocols/zephyr/Makefile.am	Sun Oct 01 18:17:49 2006 +0000
@@ -73,7 +73,7 @@
 
 ZEPHYRLIBSEXT = $(ZEPHYR_LDFLAGS) $(ZEPHYR_LIBS)
 
-libzephyr_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+libzephyr_la_LDFLAGS = -module -avoid-version
 
 if STATIC_ZEPHYR
 
@@ -90,10 +90,10 @@
 
 if EXTERNAL_LIBZEPHYR
 libzephyr_la_SOURCES = $(ZEPHYRSOURCESEXT)
-libzephyr_la_LIBADD = $(ZEPHYRLIBSEXT)
+libzephyr_la_LIBADD = $(GLIB_LIBS) $(ZEPHYRLIBSEXT)
 else
 libzephyr_la_SOURCES = $(ZEPHYRSOURCES)
-libzephyr_la_LIBADD  = $(ZEPHYRLIBS)
+libzephyr_la_LIBADD  = $(GLIB_LIBS) $(ZEPHYRLIBS)
 endif