# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1193569103 18000
# Node ID ce4beb166e920a766190cd07eee68d09e1e1ef83
# Parent  76f9a4168708de72dc94200455666a6922a80cdf
Some dependency fixes from Vitaly Lipatov.

diff -r 76f9a4168708 -r ce4beb166e92 configure.ac
--- a/configure.ac	Sat Oct 27 19:34:46 2007 -0500
+++ b/configure.ac	Sun Oct 28 05:58:23 2007 -0500
@@ -213,7 +213,7 @@
 		PICFLAGS="-fPIC -DPIC"
 		PICLDFLAGS="-fPIC -DPIC -shared"
 		LIBLDFLAGS="-fPIC -DPIC -shared"
-		AUDLDFLAGS="-L${plugindir} -Wl,-export-dynamic -Wl,-rpath=\${plugindir}"
+		AUDLDFLAGS="-L \${pluginlibdir} -Wl,-export-dynamic -Wl,-rpath=\${pluginlibdir}"
 		SHARED_SUFFIX=".so"
 		;;
 esac
diff -r 76f9a4168708 -r ce4beb166e92 extra.mk.in
--- a/extra.mk.in	Sat Oct 27 19:34:46 2007 -0500
+++ b/extra.mk.in	Sun Oct 28 05:58:23 2007 -0500
@@ -378,4 +378,5 @@
 LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
 MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
 MOWGLI_LIBS ?= @MOWGLI_LIBS@
-plugindir = @plugindir@
+pluginlibdir = @plugindir@
+plugindir = ${pluginlibdir}
diff -r 76f9a4168708 -r ce4beb166e92 src/amidi-plug/backend-alsa/Makefile
--- a/src/amidi-plug/backend-alsa/Makefile	Sat Oct 27 19:34:46 2007 -0500
+++ b/src/amidi-plug/backend-alsa/Makefile	Sun Oct 28 05:58:23 2007 -0500
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS} ${ALSA_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${ALSA_CFLAGS} ${GLIB_CFLAGS} -I../../..
-LIBS += ${ALSA_LIBS} ../pcfg/libpcfg.a
+LIBS += ${ALSA_LIBS} ${GLIB_LIBS} ../pcfg/libpcfg.a
diff -r 76f9a4168708 -r ce4beb166e92 src/amidi-plug/backend-dummy/Makefile
--- a/src/amidi-plug/backend-dummy/Makefile	Sat Oct 27 19:34:46 2007 -0500
+++ b/src/amidi-plug/backend-dummy/Makefile	Sun Oct 28 05:58:23 2007 -0500
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} -I../../..
-LIBS += ../pcfg/libpcfg.a
+LIBS += ../pcfg/libpcfg.a ${GLIB_LIBS}
diff -r 76f9a4168708 -r ce4beb166e92 src/amidi-plug/backend-fluidsynth/Makefile
--- a/src/amidi-plug/backend-fluidsynth/Makefile	Sat Oct 27 19:34:46 2007 -0500
+++ b/src/amidi-plug/backend-fluidsynth/Makefile	Sun Oct 28 05:58:23 2007 -0500
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS} ${FLUIDSYNTH_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${FLUIDSYNTH_CFLAGS} ${GLIB_CFLAGS} -I../../..
-LIBS += ${FLUIDSYNTH_LIBS} ../pcfg/libpcfg.a
+LIBS += ${FLUIDSYNTH_LIBS} ${GLIB_LIBS} ../pcfg/libpcfg.a
diff -r 76f9a4168708 -r ce4beb166e92 src/console/Makefile
--- a/src/console/Makefile	Sat Oct 27 19:34:46 2007 -0500
+++ b/src/console/Makefile	Sun Oct 28 05:58:23 2007 -0500
@@ -61,4 +61,4 @@
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lz
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lz ${MOWGLI_LIBS}
diff -r 76f9a4168708 -r ce4beb166e92 src/cue/Makefile
--- a/src/cue/Makefile	Sat Oct 27 19:34:46 2007 -0500
+++ b/src/cue/Makefile	Sun Oct 28 05:58:23 2007 -0500
@@ -9,4 +9,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${DBUS_LIB}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${DBUS_LIB} ${MOWGLI_LIBS}
diff -r 76f9a4168708 -r ce4beb166e92 src/flacng/Makefile
--- a/src/flacng/Makefile	Sat Oct 27 19:34:46 2007 -0500
+++ b/src/flacng/Makefile	Sun Oct 28 05:58:23 2007 -0500
@@ -12,4 +12,4 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBFLAC_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-LIBS += ${LIBFLAC_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${LIBFLAC_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
diff -r 76f9a4168708 -r ce4beb166e92 src/madplug/Makefile
--- a/src/madplug/Makefile	Sat Oct 27 19:34:46 2007 -0500
+++ b/src/madplug/Makefile	Sun Oct 28 05:58:23 2007 -0500
@@ -16,5 +16,5 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} ${MAD_CFLAGS} -I../..
-LDFLAGS += -${AUDLDFLAGS}
-LIBS += ${MAD_LIBS} -L${libdir} -lmad -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
+LDFLAGS += ${AUDLDFLAGS}
+LIBS += ${MAD_LIBS} -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS}
diff -r 76f9a4168708 -r ce4beb166e92 src/tta/Makefile
--- a/src/tta/Makefile	Sat Oct 27 19:34:46 2007 -0500
+++ b/src/tta/Makefile	Sun Oct 28 05:58:23 2007 -0500
@@ -10,5 +10,5 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-LDFLAGS += -${AUDLDFLAGS}
-LIBS += -L${libdir} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -laudid3tag
+LDFLAGS += ${AUDLDFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -laudid3tag