# HG changeset patch
# User Vitaly Lipatov <lav@etersoft.ru>
# Date 1193531542 18000
# Node ID ae36702ffcf9d2889a7b38e83ddfd010c66ab9ba
# Parent  9bdb5aba5e007523f3972561db564df8abe2c291
Fix linking dependencies.
Patch imported from bugzilla #38.

diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/aac/Makefile
--- a/src/aac/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/aac/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -56,4 +56,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lm
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/adplug/Makefile
--- a/src/adplug/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/adplug/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -61,4 +61,4 @@
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BINIO_CFLAGS} -I../../intl -I../.. -I./core -Dstricmp=strcasecmp
-LIBS += ${BINIO_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${BINIO_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/cdaudio-ng/Makefile
--- a/src/cdaudio-ng/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/cdaudio-ng/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -10,4 +10,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} ${ARCH_DEFINES} -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CDIO_LIBS} ${CDDB_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CDIO_LIBS} ${CDDB_LIBS} ${MOWGLI_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/gnomeshortcuts/Makefile
--- a/src/gnomeshortcuts/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/gnomeshortcuts/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
-LIBS += ${GLIB_LIBS} ${DBUS_LIBS}
+LIBS += ${GLIB_LIBS} ${DBUS_LIBS} ${GTK_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/hotkey/Makefile
--- a/src/hotkey/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/hotkey/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
-LIBS += ${GLIB_LIBS} ${DBUS_LIBS}
+LIBS += ${GLIB_LIBS} ${DBUS_LIBS} ${GTK_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/lastfm/Makefile
--- a/src/lastfm/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/lastfm/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS} ${MOWGLI_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/madplug/Makefile
--- a/src/madplug/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/madplug/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -16,4 +16,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} ${MAD_CFLAGS} -I../..
-LIBS += ${MAD_LIBS} -L${libdir} -lmad -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${MAD_LIBS} -L${libdir} -lmad -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/musepack/Makefile
--- a/src/musepack/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/musepack/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -9,4 +9,4 @@
 
 CXXFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${TAGLIB_CFLAGS} -I../../intl -I../..
-LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lmpcdec
+LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lmpcdec
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/scrobbler/Makefile
--- a/src/scrobbler/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/scrobbler/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -20,4 +20,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BEEP_DEFINES} ${CURL_CFLAGS} -I../../intl -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CURL_LIBS} ${MUSICBRAINZ_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CURL_LIBS} ${MUSICBRAINZ_LIBS} ${MOWGLI_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/sexypsf/Makefile
--- a/src/sexypsf/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/sexypsf/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -20,4 +20,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -Ispu/ -I.
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lz
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lz
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/sndstretch/Makefile
--- a/src/sndstretch/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/sndstretch/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -10,3 +10,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MONWGLI_LIBS} ${PANGO_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/timidity/Makefile
--- a/src/timidity/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/timidity/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -22,4 +22,4 @@
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I./libtimidity
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/tta/Makefile
--- a/src/tta/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/tta/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -10,4 +10,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-LIBS += -L${libdir} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -laudid3tag
+LIBS += -L${libdir} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -laudid3tag
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/vorbis/Makefile
--- a/src/vorbis/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/vorbis/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -12,4 +12,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-LIBS += ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/vtx/Makefile
--- a/src/vtx/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/vtx/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -15,4 +15,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. -I.
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
diff -r 9bdb5aba5e00 -r ae36702ffcf9 src/wavpack/Makefile
--- a/src/wavpack/Makefile	Sat Oct 27 15:52:23 2007 -0500
+++ b/src/wavpack/Makefile	Sat Oct 27 19:32:22 2007 -0500
@@ -12,4 +12,4 @@
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${WAVPACK_CFLAGS} -I../../intl -I../..
 CXXFLAGS += ${PLUGIN_CFLAGS}
 LDFLAGS += -lstdc++
-LIBS += ${WAVPACK_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${WAVPACK_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}