# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190871539 18000
# Node ID a0c7cf5638de4b538d8fbb68674bbed914f0e8a9
# Parent  276d2a3d998edd42efc46ea9c7c76207789c894b# Parent  5c01978673cad346cc391526a9c56c57d8824431
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 276d2a3d998e -r a0c7cf5638de buildsys.mk.in
--- a/buildsys.mk.in	Wed Sep 26 19:06:37 2007 -0500
+++ b/buildsys.mk.in	Thu Sep 27 00:38:59 2007 -0500
@@ -101,7 +101,7 @@
 				;; \
 			esac; \
 		done; \
-		if ${CPP} ${CPPFLAGS} -M $$list >.deps; then \
+		if ${CPP} ${CPPFLAGS} ${CFLAGS} -M $$list >.deps; then \
 			${DEPEND_OK}; \
 		else \
 			${DEPEND_FAILED}; \
diff -r 276d2a3d998e -r a0c7cf5638de src/metronom/Makefile
--- a/src/metronom/Makefile	Wed Sep 26 19:06:37 2007 -0500
+++ b/src/metronom/Makefile	Thu Sep 27 00:38:59 2007 -0500
@@ -1,5 +1,4 @@
-h
-LUGIN = metronom${PLUGIN_SUFFIX}
+PLUGIN = metronom${PLUGIN_SUFFIX}
 SRCS = metronom.c
 
 plugindir = audacious/${INPUT_PLUGIN_DIR}
diff -r 276d2a3d998e -r a0c7cf5638de src/wavpack/Makefile
--- a/src/wavpack/Makefile	Wed Sep 26 19:06:37 2007 -0500
+++ b/src/wavpack/Makefile	Thu Sep 27 00:38:59 2007 -0500
@@ -10,4 +10,5 @@
 
 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}