# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190736220 -7200
# Node ID ce50c659ac4b825c3bf6815d419dbc090d19a18f
# Parent  50f1c5a40a7dc1a00ac5e34fb53e9027b247084c# Parent  0380796ac439e1b954ecc29401797709933bb173
Automated merge with ssh://sidhe.atheme.org//hg/audacious-plugins

diff -r 50f1c5a40a7d -r ce50c659ac4b src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Tue Sep 25 18:03:21 2007 +0200
+++ b/src/console/Audacious_Driver.cxx	Tue Sep 25 18:03:40 2007 +0200
@@ -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 50f1c5a40a7d -r ce50c659ac4b src/console/Makefile
--- a/src/console/Makefile	Tue Sep 25 18:03:21 2007 +0200
+++ b/src/console/Makefile	Tue Sep 25 18:03:40 2007 +0200
@@ -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 50f1c5a40a7d -r ce50c659ac4b src/sid/Makefile
--- a/src/sid/Makefile	Tue Sep 25 18:03:21 2007 +0200
+++ b/src/sid/Makefile	Tue Sep 25 18:03:40 2007 +0200
@@ -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++