# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190847300 18000
# Node ID 21508f1dca471adc24880d046ca2ec07df31510b
# Parent  5af55c925d6eaebe990bfad2c5947d3265151ece# Parent  96da96b1bbebc4437cdb87c977395a04904f62ea
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 5af55c925d6e -r 21508f1dca47 src/metronom/Makefile
--- a/src/metronom/Makefile	Wed Sep 26 16:18:41 2007 -0500
+++ b/src/metronom/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -1,4 +1,5 @@
-PLUGIN = metronom${PLUGIN_SUFFIX}
+h
+LUGIN = metronom${PLUGIN_SUFFIX}
 SRCS = metronom.c
 
 plugindir = audacious/${INPUT_PLUGIN_DIR}
diff -r 5af55c925d6e -r 21508f1dca47 src/tonegen/Makefile
--- a/src/tonegen/Makefile	Wed Sep 26 16:18:41 2007 -0500
+++ b/src/tonegen/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -6,6 +6,8 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../..
+
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r 5af55c925d6e -r 21508f1dca47 src/vtx/Makefile
diff -r 5af55c925d6e -r 21508f1dca47 src/wav/Makefile