# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190811738 -7200
# Node ID 96da96b1bbebc4437cdb87c977395a04904f62ea
# Parent  eed7c270e8dd922ba8e1f9bf5f6b95f1734e4710
Even more Makefile fixes.

diff -r eed7c270e8dd -r 96da96b1bbeb src/filewriter/Makefile
--- a/src/filewriter/Makefile	Wed Sep 26 14:53:37 2007 +0200
+++ b/src/filewriter/Makefile	Wed Sep 26 15:02:18 2007 +0200
@@ -1,4 +1,4 @@
-PLUGIN = filewriter${SHARED_SUFFIX}
+PLUGIN = filewriter${PLUGIN_SUFFIX}
 SRCS = filewriter.c	\
        wav.c		\
        mp3.c		\
diff -r eed7c270e8dd -r 96da96b1bbeb src/flacng/Makefile
--- a/src/flacng/Makefile	Wed Sep 26 14:53:37 2007 +0200
+++ b/src/flacng/Makefile	Wed Sep 26 15:02:18 2007 +0200
@@ -1,4 +1,4 @@
-PLUGIN = flacng${SHARED_SUFFIX}
+PLUGIN = flacng${PLUGIN_SUFFIX}
 SRCS = plugin.c				\
        tools.c				\
        seekable_stream_callbacks.c	\
diff -r eed7c270e8dd -r 96da96b1bbeb src/metronom/Makefile
--- a/src/metronom/Makefile	Wed Sep 26 14:53:37 2007 +0200
+++ b/src/metronom/Makefile	Wed Sep 26 15:02:18 2007 +0200
@@ -1,4 +1,4 @@
-PLUGIN = metronom${SHARED_SUFFIX}
+PLUGIN = metronom${PLUGIN_SUFFIX}
 SRCS = metronom.c
 
 plugindir = audacious/${INPUT_PLUGIN_DIR}
@@ -6,6 +6,6 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBMOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r eed7c270e8dd -r 96da96b1bbeb src/timidity/Makefile
--- a/src/timidity/Makefile	Wed Sep 26 14:53:37 2007 +0200
+++ b/src/timidity/Makefile	Wed Sep 26 15:02:18 2007 +0200
@@ -16,8 +16,8 @@
 
 plugindir = audacious/${INPUT_PLUGIN_DIR}
 
-include ../../../buildsys.mk
-include ../../../extra.mk
+include ../../buildsys.mk
+include ../../extra.mk
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I./libtimidity
 CFLAGS += ${PLUGIN_CFLAGS}
diff -r eed7c270e8dd -r 96da96b1bbeb src/tonegen/Makefile
--- a/src/tonegen/Makefile	Wed Sep 26 14:53:37 2007 +0200
+++ b/src/tonegen/Makefile	Wed Sep 26 15:02:18 2007 +0200
@@ -6,6 +6,6 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBMOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r eed7c270e8dd -r 96da96b1bbeb src/vtx/Makefile
--- a/src/vtx/Makefile	Wed Sep 26 14:53:37 2007 +0200
+++ b/src/vtx/Makefile	Wed Sep 26 15:02:18 2007 +0200
@@ -1,4 +1,4 @@
-PLUGIN = vtx${SHARED_SUFFIX}
+PLUGIN = vtx${PLUGIN_SUFFIX}
 SRCS = about.c		\
        ay8912.c		\
        config.c		\
@@ -12,6 +12,6 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. -I.
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBMOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. -I.
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r eed7c270e8dd -r 96da96b1bbeb src/wav/Makefile
--- a/src/wav/Makefile	Wed Sep 26 14:53:37 2007 +0200
+++ b/src/wav/Makefile	Wed Sep 26 15:02:18 2007 +0200
@@ -1,11 +1,12 @@
+include ../../extra.mk
+
 PLUGIN = wav${PLUGIN_SUFFIX}
 SRCS = wav${WAV_SNDFILE}.c
 
 plugindir = audacious/${INPUT_PLUGIN_DIR}
 
 include ../../buildsys.mk
-include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. 
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. 
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${MOWGLI_LIBS} ${SNDFILE_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}