# HG changeset patch
# User Eugene Paskevich <eugene@raptor.kiev.ua>
# Date 1192003886 -10800
# Node ID 1ad002ce1bd0d59a1238306a24afae8fbf721c62
# Parent  ecd1e22f7e8050e3c8807779df87c24b0ffa4703
Just a tiny cleanup.

diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/CoreAudio/Makefile
--- a/src/CoreAudio/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/CoreAudio/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = CoreAudio${PLUGIN_SUFFIX}
+
 SRCS = about.c		\
        configure.c	\
        coreaudio.c	\
@@ -13,6 +14,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I../../intl -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/OSS/Makefile
--- a/src/OSS/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/OSS/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = OSS${PLUGIN_SUFFIX}
+
 SRCS = OSS.c		\
        mixer.c		\
        about.c		\
@@ -12,6 +13,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${OSS_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -I.
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${OSS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/OSS4/Makefile
--- a/src/OSS4/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/OSS4/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = OSS4${PLUGIN_SUFFIX}
+
 SRCS = OSS4.c		\
        about.c		\
        configure.c	\
@@ -11,6 +12,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I/usr/lib/oss/include -I../../intl -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${OSS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/aac/Makefile
--- a/src/aac/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/aac/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = aac${PLUGIN_SUFFIX}
+
 SRCS = libmp4.c			\
        mp4_utils.c		\
        aac_utils.c		\
@@ -53,6 +54,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
-CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lm
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/adplug/Makefile
--- a/src/adplug/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/adplug/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = adplug${PLUGIN_SUFFIX}
+
 SRCS = adplug-xmms.cc		\
        core/fmopl.c		\
        core/debug.c		\
@@ -57,9 +58,7 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
-LD = ${CXX}
-
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BINIO_CFLAGS} -I../../intl -I../.. -I./core -Dstricmp=strcasecmp
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BINIO_CFLAGS} -I../../intl -I../.. -I./core -Dstricmp=strcasecmp
 LIBS += ${BINIO_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/alac/Makefile
--- a/src/alac/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/alac/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = alac${PLUGIN_SUFFIX}
+
 SRCS = alac.c	\
        demux.c	\
        plugin.c	\
@@ -9,6 +10,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/alarm/Makefile
--- a/src/alarm/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/alarm/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,5 +1,6 @@
 PLUGIN = alarm${PLUGIN_SUFFIX}
-SRCS = alarm.c	\
+
+SRCS = alarm.c		\
        interface.c
 
 include ../../buildsys.mk
@@ -7,6 +8,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/alsa/Makefile
--- a/src/alsa/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/alsa/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = ALSA${PLUGIN_SUFFIX}
+
 SRCS = alsa.c		\
        about.c		\
        audio.c		\
@@ -10,6 +11,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ALSA_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${ALSA_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/amidi-plug/Makefile
--- a/src/amidi-plug/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/amidi-plug/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,30 +1,25 @@
 PLUGIN = amidi-plug$(PLUGIN_SUFFIX)
-SUBDIRS = pcfg $(AMIDIPLUG_BACKENDS)
 
-noinst_HEADERS = amidi-plug.h i_backend.h i_midi.h i_midievent.h \
-                 i_vfslayer.h i_configure.h i_configure_private.h \
-                 i_configure_file.h i_configure-ap.h i_configure-alsa.h \
-                 i_configure-fluidsynth.h i_configure-dummy.h \
-                 i_fileinfo.h i_utils.h i_common.h \
-                 amidi-plug-icon.xpm amidi-plug.logo.xpm \
-                 amidi-plug.midiicon.xpm
+SRCS = amidi-plug.c		\
+       i_vfslayer.c		\
+       i_midi.c			\
+       i_backend.c		\
+       i_configure.c		\
+       i_configure-ap.c		\
+       i_configure-alsa.c	\
+       i_configure-fluidsynth.c	\
+       i_configure-dummy.c	\
+       i_utils.c		\
+       i_fileinfo.c
 
-SRCS = amidi-plug.c i_vfslayer.c i_midi.c i_backend.c \
-          i_configure.c i_configure-ap.c i_configure-alsa.c \
-          i_configure-fluidsynth.c i_configure-dummy.c \
-          i_utils.c i_fileinfo.c
+SUBDIRS = pcfg $(AMIDIPLUG_BACKENDS)
 
 include ../../buildsys.mk
 include ../../extra.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-EXT_DEPS = ./pcfg/libpcfg.a
-
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) $(MOWGLI_CFLAGS) \
 	-DAMIDIPLUGBACKENDDIR=\"$(plugindir)/$(AMIDIPLUG_BACKEND_DIR)\" -I../../intl -I../..
-
 LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
 
 plugindir := $(plugindir)/$(INPUT_PLUGIN_DIR)
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/amidi-plug/backend-alsa/Makefile
--- a/src/amidi-plug/backend-alsa/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/amidi-plug/backend-alsa/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,5 +1,4 @@
 PLUGIN = ap-alsa$(PLUGIN_SUFFIX)
-noinst_HEADERS = b-alsa.h b-alsa-config.h backend-alsa-icon.xpm
 
 SRCS = b-alsa.c
 
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/amidi-plug/backend-dummy/Makefile
--- a/src/amidi-plug/backend-dummy/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/amidi-plug/backend-dummy/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,5 +1,4 @@
 PLUGIN = ap-dummy$(PLUGIN_SUFFIX)
-noinst_HEADERS = b-dummy.h b-dummy-config.h backend-dummy-icon.xpm
 
 SRCS = b-dummy.c
 
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/amidi-plug/backend-fluidsynth/Makefile
--- a/src/amidi-plug/backend-fluidsynth/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/amidi-plug/backend-fluidsynth/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,5 +1,4 @@
 PLUGIN = ap-fluidsynth$(PLUGIN_SUFFIX)
-noinst_HEADERS = b-fluidsynth.h b-fluidsynth-config.h backend-fluidsynth-icon.xpm
 
 SRCS = b-fluidsynth.c
 
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/amidi-plug/pcfg/Makefile
--- a/src/amidi-plug/pcfg/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/amidi-plug/pcfg/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,12 +1,9 @@
-SRCS = i_pcfg.c
+STATIC_LIB_NOINST = libpcfg.a
 
-STATIC_LIB_NOINST = libpcfg.a
+SRCS = i_pcfg.c
 
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-noinst_HEADERS = i_pcfg.h
-
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) -I../../..
-
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/aosd/Makefile
--- a/src/aosd/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/aosd/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = aosd${PLUGIN_SUFFIX}
+
 SRCS = aosd.c		\
        aosd_osd.c	\
        aosd_style.c	\
@@ -13,6 +14,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CAIRO_CFLAGS} ${PANGOCAIRO_CFLAGS} ${XRENDER_CFLAGS} ${XCOMPOSITE_CFLAGS} -I../../intl -I../.. -I..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CAIRO_LIBS} ${PANGOCAIRO_LIBS} ${XRENDER_LIBS} ${XCOMPOSITE_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/arts/Makefile
--- a/src/arts/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/arts/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,16 +1,17 @@
-SUBDIRS = arts_helper
+PLUGIN = arts${PLUGIN_SUFFIX}
 
-PLUGIN = arts${PLUGIN_SUFFIX}
 SRCS = arts.c		\
        configure.c	\
        audio.c		\
        convert.c
 
+SUBDIRS = arts_helper
+
 include ../../buildsys.mk
 include ../../extra.mk
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARTSC_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${ARTSC_LIBS} -lpthread
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/arts/arts_helper/Makefile
--- a/src/arts/arts_helper/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/arts/arts_helper/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PROG = audacious-arts-helper${PROG_SUFFIX}
+
 SRCS = arts_helper.c
 
 include ../../../buildsys.mk
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/audiocompress/Makefile
--- a/src/audiocompress/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/audiocompress/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = audiocompress${PLUGIN_SUFFIX}
+
 SRCS = compress.c	\
        audacious-glue.c
 
@@ -7,6 +8,6 @@
 
 plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/blur_scope/Makefile
--- a/src/blur_scope/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/blur_scope/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,14 +1,13 @@
 PLUGIN = blur_scope${PLUGIN_SUFFIX}
+
 SRCS = blur_scope.c	\
        config.c
 
-plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
 plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/cdaudio-ng/Makefile
--- a/src/cdaudio-ng/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/cdaudio-ng/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = cdaudio-ng${PLUGIN_SUFFIX}
+
 SRCS = cdaudio-ng.c	\
        configure.c
 
@@ -7,6 +8,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES}
 CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} ${ARCH_DEFINES} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CDIO_LIBS} ${CDDB_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/console/Makefile
--- a/src/console/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/console/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = console${PLUGIN_SUFFIX}
+
 SRCS = Audacious_Config.cxx    \
        Audacious_Driver.cxx    \
        Ay_Apu.cxx              \
@@ -55,9 +56,7 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
-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}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lz
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/cue/Makefile
--- a/src/cue/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/cue/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = cuesheet${PLUGIN_SUFFIX}
+
 SRCS = cuesheet.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${DBUS_LIB}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/curl/Makefile
--- a/src/curl/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/curl/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = curl${PLUGIN_SUFFIX}
+
 SRCS = curl.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/dockalbumart/Makefile
--- a/src/dockalbumart/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/dockalbumart/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = dockalbumart${PLUGIN_SUFFIX}
+
 SRCS = dockalbumart.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/echo_plugin/Makefile
--- a/src/echo_plugin/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/echo_plugin/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = echo${PLUGIN_SUFFIX}
+
 SRCS = echo.c	\
        gui.c
 
@@ -7,6 +8,6 @@
 
 plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/esd/Makefile
--- a/src/esd/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/esd/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = ESD${PLUGIN_SUFFIX}
+
 SRCS = esd.c		\
        mixer.c		\
        about.c		\
@@ -11,6 +12,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ESD_CFLAGS} -I../../intl -I../.. -I..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${ESD_LIBS} ${OSS_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/evdev-plug/Makefile
--- a/src/evdev-plug/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/evdev-plug/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = evdev-plug${PLUGIN_SUFFIX}
+
 SRCS = ed.c			\
        ed_bindings_store.c	\
        ed_internals.c		\
@@ -9,6 +10,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/filewriter/Makefile
--- a/src/filewriter/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/filewriter/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = filewriter${PLUGIN_SUFFIX}
+
 SRCS = filewriter.c	\
        wav.c		\
        mp3.c		\
@@ -10,6 +11,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/flacng/Makefile
--- a/src/flacng/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/flacng/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = flacng${PLUGIN_SUFFIX}
+
 SRCS = plugin.c				\
        tools.c				\
        seekable_stream_callbacks.c	\
@@ -9,6 +10,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. ${LIBFLAC_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${LIBFLAC_LIBS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBFLAC_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+LIBS += ${LIBFLAC_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/gnomeshortcuts/Makefile
--- a/src/gnomeshortcuts/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/gnomeshortcuts/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = gnomeshortcuts${PLUGIN_SUFFIX}
+
 SRCS = gnomeshortcuts.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GLIB_LIBS} ${DBUS_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/hotkey/Makefile
--- a/src/hotkey/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/hotkey/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -7,6 +7,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GLIB_LIBS} ${DBUS_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/jack/Makefile
--- a/src/jack/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/jack/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = jackout${PLUGIN_SUFFIX}
+
 SRCS = jack.c		\
        configure.c	\
        bio2jack.c
@@ -8,6 +9,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${SAMPLERATE_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${JACK_LIBS} ${SAMPLERATE_LIBS} -pthread
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/ladspa/Makefile
--- a/src/ladspa/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/ladspa/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = ladspa${PLUGIN_SUFFIX}
+
 SRCS = ladspa.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/lastfm/Makefile
--- a/src/lastfm/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/lastfm/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -7,6 +7,6 @@
 
 plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/lirc/Makefile
--- a/src/lirc/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/lirc/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,13 +1,13 @@
 PLUGIN = lirc$(PLUGIN_SUFFIX)
 
-SRCS = about.c lirc.c
+SRCS = about.c \
+       lirc.c
 
 include ../../buildsys.mk
 include ../../extra.mk
 
 plugindir := $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBS += -llirc_client $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(MOWGLI_CFLAGS) $(PANGO_CFLAGS) $(DBUS_CFLAGS) -I../../intl -I../..
-
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -llirc_client
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/m3u/Makefile
--- a/src/m3u/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/m3u/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -7,6 +7,6 @@
 
 plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../.. -Wall
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/madplug/Makefile
--- a/src/madplug/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/madplug/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = madplug${PLUGIN_SUFFIX}
+
 SRCS = configure.c	\
        dither.c		\
        input.c		\
@@ -13,6 +14,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += -L${libdir} -laudid3tag -lmad ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += -lmad -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/metronom/Makefile
--- a/src/metronom/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/metronom/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -7,6 +7,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/modplug/Makefile
--- a/src/modplug/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/modplug/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = modplug${PLUGIN_SUFFIX}
+
 SRCS = plugin.cxx		\
        modplugbmp.cxx		\
        tables.cxx		\
@@ -50,7 +51,7 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I.. -I../.. -I../../intl
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I.. -I../.. -I../../intl
 LIBS += ${MOWGLI_LIBS} ${DBUS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lstdc++
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/modplug/gui/Makefile
--- a/src/modplug/gui/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/modplug/gui/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,9 +1,12 @@
-include ../../../extra.mk
+STATIC_LIB_NOINST = libgui.a
 
-STATIC_LIB_NOINST = libgui.a
-SRCS = main.cxx support.cxx interface.cxx callbacks.cxx
+SRCS = main.cxx		\
+       support.cxx	\
+       interface.cxx	\
+       callbacks.cxx
 
 include ../../../buildsys.mk
+include ../../../extra.mk
 
 CFLAGS   += $(PLUGIN_CFLAGS)
 CXXFLAGS += $(PLUGIN_CFLAGS)
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/mtp_up/Makefile
--- a/src/mtp_up/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/mtp_up/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = mtp_up${PLUGIN_SUFFIX}
+
 SRCS = mtp.c filetype.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. ${MTP_CFLAGS}
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MTP_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/musepack/Makefile
--- a/src/musepack/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/musepack/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = musepack${PLUGIN_SUFFIX}
+
 SRCS = libmpc.cxx
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CXXFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${TAGLIB_CFLAGS} -I../../intl -I../..
-CXXFLAGS += ${PLUGIN_CFLAGS}
-LIBS += -lmpcdec ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lmpcdec
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/neon/Makefile
--- a/src/neon/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/neon/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = neon${PLUGIN_SUFFIX}
+
 SRCS = neon.c	\
        rb.c
 
@@ -7,6 +8,6 @@
 
 plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${NEON_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${NEON_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/null/Makefile
--- a/src/null/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/null/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = null${PLUGIN_SUFFIX}
+
 SRCS = null.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/paranormal/Makefile
--- a/src/paranormal/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/paranormal/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,6 +1,5 @@
-SUBDIRS = presets
+PLUGIN = paranormal${PLUGIN_SUFFIX}
 
-PLUGIN = paranormal${PLUGIN_SUFFIX}
 SRCS = actuators.c		\
        beatdetect.c		\
        builtins.c		\
@@ -22,11 +21,13 @@
        libcalc/parser.c		\
        libcalc/storage.c
 
+SUBDIRS = presets
+
 include ../../buildsys.mk
 include ../../extra.mk
 
 plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} -I../../intl -I../.. -I.
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${SDL_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/pls/Makefile
--- a/src/pls/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/pls/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -6,6 +6,6 @@
 
 plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/projectm-1.0/Makefile
--- a/src/projectm-1.0/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/projectm-1.0/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = projectm-1.0${PLUGIN_SUFFIX}
+
 SRCS = main.cxx		\
        video_init.cxx   \
        ConfigFile.cxx   \
@@ -9,7 +10,7 @@
 
 plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} ${LIBPROJECTM1_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} ${LIBPROJECTM1_CFLAGS} -I../../intl -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${SDL_LIBS} ${LIBPROJECTM1_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/projectm/Makefile
--- a/src/projectm/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/projectm/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = projectm${PLUGIN_SUFFIX}
+
 SRCS = main.c		\
        video_init.c
 
@@ -7,6 +8,6 @@
 
 plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} ${LIBPROJECTM_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${SDL_LIBS} ${LIBPROJECTM_LIBS} -lprojectM
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/pulse_audio/Makefile
--- a/src/pulse_audio/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/pulse_audio/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = pulse_audio${PLUGIN_SUFFIX}
+
 SRCS = pulse_audio.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += -lpulse ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/rocklight/Makefile
--- a/src/rocklight/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/rocklight/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = rocklight${PLUGIN_SUFFIX}
+
 SRCS = rocklight.c	\
        sysled.c		\
        thinklight.c
@@ -8,6 +9,6 @@
 
 plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/rootvis/Makefile
--- a/src/rootvis/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/rootvis/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = rootvis${PLUGIN_SUFFIX}
+
 SRCS = config_backend.c			\
        config_definition.c		\
        config_frontend.c		\
@@ -11,6 +12,6 @@
 
 plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${IMLIB2_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${IMLIB2_CFLAGS} -I.
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${IMLIB2_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/scrobbler/Makefile
--- a/src/scrobbler/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/scrobbler/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = scrobbler${PLUGIN_SUFFIX}
+
 SRCS = fmt.c			\
        configure.c		\
        gtkstuff.c		\
@@ -17,6 +18,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BEEP_DEFINES} ${CURL_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CURL_LIBS} ${MUSICBRAINZ_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/sexypsf/Makefile
--- a/src/sexypsf/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/sexypsf/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = sexypsf${PLUGIN_SUFFIX}
+
 SRCS = PsxBios.c 	\
        PsxCounters.c	\
        PsxDma.c		\
@@ -17,6 +18,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -Ispu/ -I.
-CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += -lz ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lz
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/shnplug/Makefile
--- a/src/shnplug/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/shnplug/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -20,9 +20,9 @@
 plugindir := $(plugindir)/$(INPUT_PLUGIN_DIR)
 
 CFLAGS += $(PLUGIN_CFLAGS)
+LDFLAGS += $(AUDLDFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(MOWGLI_CFLAGS) \
 	    $(PANGO_CFLAGS) $(ARCH_DEFINES) $(SIMD_CFLAGS) -I../../intl -I../.. -Wall
-LDFLAGS += $(AUDLDFLAGS)
 LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 # These were the additional link flags in the old Makefile:
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/sid/Makefile
--- a/src/sid/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/sid/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = sid${PLUGIN_SUFFIX}
+
 SRCS = xs_init.c	\
        xs_about.c	\
        xs_support.c	\
@@ -22,7 +23,7 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
-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}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} -D_REENTRANT -I../../intl -I../.. -DAUDACIOUS_PLUGIN ${MOWGLI_CFLAGS} ${SIDPLAY1_INCLUDES} ${SIDPLAY2_INCLUDES} ${BUILDERS_INCLUDES} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
 LIBS += ${BUILDERS_LDFLAGS} ${SIDPLAY1_LDADD} ${SIDPLAY2_LDADD} ${RESID_LDADD} ${HARDSID_LDADD} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lstdc++
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/smb/Makefile
--- a/src/smb/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/smb/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = smb${PLUGIN_SUFFIX}
+
 SRCS = smb.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} -lsmbclient
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/sndstretch/Makefile
--- a/src/sndstretch/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/sndstretch/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,10 +1,12 @@
 PLUGIN = sndstretch${PLUGIN_SUFFIX}
-SRCS = sndstretch_xmms.c sndstretch.c
+
+SRCS = sndstretch_xmms.c \
+       sndstretch.c
 
 include ../../buildsys.mk
 include ../../extra.mk
 
 plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/song_change/Makefile
--- a/src/song_change/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/song_change/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = song_change${PLUGIN_SUFFIX}
+
 SRCS = song_change.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/spectrum/Makefile
--- a/src/spectrum/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/spectrum/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = spectrum${PLUGIN_SUFFIX}
+
 SRCS = spectrum.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/statusicon/Makefile
--- a/src/statusicon/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/statusicon/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = statusicon${PLUGIN_SUFFIX}
+
 SRCS = gtktrayicon-x11.c	\
        si.c			\
        si_cfg.c			\
@@ -9,6 +10,6 @@
 
 plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/stdio/Makefile
--- a/src/stdio/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/stdio/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = stdio${PLUGIN_SUFFIX}
+
 SRCS = stdio.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/stereo_plugin/Makefile
--- a/src/stereo_plugin/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/stereo_plugin/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = stereo${PLUGIN_SUFFIX}
+
 SRCS = stereo.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/sun/Makefile
--- a/src/sun/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/sun/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = sun$(PLUGIN_SUFFIX)
+
 SRCS =	sun.c	    \
 	audio.c	    \
 	convert.c   \
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/timidity/Makefile
--- a/src/timidity/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/timidity/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = timidity${PLUGIN_SUFFIX}
+
 SRCS = callbacks.c			\
        interface.c			\
        xmms-timidity.c			\
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/tonegen/Makefile
--- a/src/tonegen/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/tonegen/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = tonegen${PLUGIN_SUFFIX}
+
 SRCS = tonegen.c
 
 include ../../buildsys.mk
@@ -6,7 +7,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../..
-
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/tta/Makefile
--- a/src/tta/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/tta/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = tta${PLUGIN_SUFFIX}
+
 SRCS = libtta.c	\
        ttadec.c
 
@@ -7,6 +8,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += -L${libdir} -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -laudid3tag
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/voice_removal/Makefile
--- a/src/voice_removal/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/voice_removal/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = voice_removal${PLUGIN_SUFFIX}
+
 SRCS = voice_removal.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/vorbis/Makefile
--- a/src/vorbis/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/vorbis/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = vorbis${PLUGIN_SUFFIX}
+
 SRCS = configure.c	\
        fileinfo.c	\
        vcedit.c		\
@@ -9,6 +10,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/vtx/Makefile
--- a/src/vtx/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/vtx/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = vtx${PLUGIN_SUFFIX}
+
 SRCS = about.c		\
        ay8912.c		\
        config.c		\
@@ -12,6 +13,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_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 ecd1e22f7e80 -r 1ad002ce1bd0 src/wav/Makefile
--- a/src/wav/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/wav/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,12 +1,13 @@
 include ../../extra.mk
 
 PLUGIN = wav${PLUGIN_SUFFIX}
+
 SRCS = wav${WAV_SNDFILE}.c
 
 include ../../buildsys.mk
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. 
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${MOWGLI_LIBS} ${SNDFILE_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/wavpack/Makefile
--- a/src/wavpack/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/wavpack/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = wavpack${PLUGIN_SUFFIX}
+
 SRCS = tags.cxx		\
        ui.cxx		\
        libwavpack.cxx
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/wma/Makefile
--- a/src/wma/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/wma/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = wma${PLUGIN_SUFFIX}
+
 SRCS = wma.c			\
        libffwma/allcodecs.c	\
        libffwma/allformats.c	\
@@ -25,6 +26,6 @@
 
 plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${SIMD_CFLAGS} -I../.. -I./libffwma -std=c99 ${GCC42_CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r ecd1e22f7e80 -r 1ad002ce1bd0 src/xspf/Makefile
--- a/src/xspf/Makefile	Wed Oct 10 09:01:48 2007 +0300
+++ b/src/xspf/Makefile	Wed Oct 10 11:11:26 2007 +0300
@@ -1,4 +1,5 @@
 PLUGIN = xspf${PLUGIN_SUFFIX}
+
 SRCS = xspf.c
 
 include ../../buildsys.mk
@@ -6,6 +7,6 @@
 
 plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
 
+CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
-CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}