# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1190733394 -10800
# Node ID 0380796ac439e1b954ecc29401797709933bb173
# Parent  2a5ee6ed598d2fe71a400bf87502b920f98dbb68# Parent  00738dd0dce608da0a44543ae68b6628e389d2d8
Automated merge with http://hg.atheme.org/audacious-plugins

diff -r 00738dd0dce6 -r 0380796ac439 src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Tue Sep 25 16:51:17 2007 +0200
+++ b/src/console/Audacious_Driver.cxx	Tue Sep 25 18:16:34 2007 +0300
@@ -12,7 +12,6 @@
 #include <audacious/i18n.h>
 #include <gtk/gtk.h>
 extern "C" {
-#include "audacious/main.h"
 #include "audacious/tuple.h"
 #include "audacious/tuple_formatter.h"
 #include "audacious/util.h"
diff -r 00738dd0dce6 -r 0380796ac439 src/console/Makefile
--- a/src/console/Makefile	Tue Sep 25 16:51:17 2007 +0200
+++ b/src/console/Makefile	Tue Sep 25 18:16:34 2007 +0300
@@ -55,7 +55,9 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${DBUS_CFLAGS} -I../../intl -I../..
+LD = ${CXX}
+
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
-LIBS += -lz ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}$ ${DBUS_LIB} 
+LIBS += -lz ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r 00738dd0dce6 -r 0380796ac439 src/sid/Makefile
--- a/src/sid/Makefile	Tue Sep 25 16:51:17 2007 +0200
+++ b/src/sid/Makefile	Tue Sep 25 18:16:34 2007 +0300
@@ -22,9 +22,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-LD = ${CXX}
-
 CPPFLAGS += ${PLUGIN_CPPFLAGS} -D_REENTRANT -I../../intl -I../.. -DAUDACIOUS_PLUGIN ${MOWGLI_CFLAGS} ${SIDPLAY1_INCLUDES} ${SIDPLAY2_INCLUDES} ${BUILDERS_INCLUDES} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${SIDPLAY1_LDADD} ${SIDPLAY2_LDADD} ${HARDSID_LDADD} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${BUILDERS_LDFLAGS} ${SIDPLAY1_LDADD} ${SIDPLAY2_LDADD} ${RESID_LDADD} ${HARDSID_LDADD} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lstdc++