changeset 2528:134deb25be83

Remove DBUS_CFLAGS and DBUS_LIBS from Makefiles that don't need them.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 17 Apr 2008 05:34:30 +0300
parents 74ce4495e533
children 0bd07451d1d1 7386fea4c673
files src/OSS/Makefile src/aac/Makefile src/alac/Makefile src/alsa/Makefile src/aosd/Makefile src/cdaudio-ng/Makefile src/demac/Makefile src/esd/Makefile src/filewriter/Makefile src/flacng/Makefile src/hotkey/Makefile src/lastfm/Makefile src/lirc/Makefile src/m3u/Makefile src/madplug/Makefile src/mms/Makefile src/modplug/Makefile src/modplug/gui/Makefile src/musepack/Makefile src/neon/Makefile src/null/Makefile src/paranormal-ng/Makefile src/paranormal/Makefile src/pls/Makefile src/projectm-1.0/Makefile src/projectm/Makefile src/scrobbler/Makefile src/smb/Makefile src/sndfile/Makefile src/stdio/Makefile src/sun/Makefile src/timidity/Makefile src/tta/Makefile src/vorbis/Makefile src/wavpack/Makefile src/wma/Makefile src/xspf/Makefile
diffstat 37 files changed, 39 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/src/OSS/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/OSS/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -14,5 +14,5 @@
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${OSS_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -I.
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${OSS_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -I.
 LIBS += ${OSS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} 
--- a/src/aac/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/aac/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -55,5 +55,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lm
--- a/src/alac/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/alac/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -11,5 +11,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} 
--- a/src/alsa/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/alsa/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -12,5 +12,5 @@
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ALSA_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ALSA_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${ALSA_LIBS}
--- a/src/aosd/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/aosd/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -15,5 +15,5 @@
 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../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CAIRO_CFLAGS} ${PANGOCAIRO_CFLAGS} ${XRENDER_CFLAGS} ${XCOMPOSITE_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CAIRO_LIBS} ${PANGOCAIRO_LIBS} ${XRENDER_LIBS} ${XCOMPOSITE_LIBS}
--- a/src/cdaudio-ng/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/cdaudio-ng/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -9,5 +9,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${CDIO_CFLAGS} ${CDDB_CFLAGS} ${ARCH_DEFINES} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${CDIO_CFLAGS} ${CDDB_CFLAGS} ${ARCH_DEFINES} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${CDIO_LIBS} ${CDDB_LIBS} ${MOWGLI_LIBS}
--- a/src/demac/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/demac/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -11,5 +11,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
--- a/src/esd/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/esd/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -13,5 +13,5 @@
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ESD_CFLAGS} -I../.. -I..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ESD_CFLAGS} -I../.. -I..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${ESD_LIBS} ${OSS_LIBS}
--- a/src/filewriter/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/filewriter/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -12,5 +12,5 @@
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS}  ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${FILEWRITER_CFLAGS} ${OGG_VORBIS_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS}  ${MOWGLI_CFLAGS}  ${FILEWRITER_CFLAGS} ${OGG_VORBIS_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS}
--- a/src/flacng/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/flacng/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -11,5 +11,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBFLAC_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBFLAC_CFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
 LIBS += ${LIBFLAC_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
--- a/src/hotkey/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/hotkey/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -8,5 +8,5 @@
 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../.. -I..
-LIBS += ${GLIB_LIBS} ${DBUS_LIBS} ${GTK_LIBS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS}  -I../.. -I..
+LIBS += ${GLIB_LIBS}  ${GTK_LIBS}
--- a/src/lastfm/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/lastfm/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -8,5 +8,5 @@
 plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS} ${CURL_LIBS} ${MOWGLI_LIBS}
--- a/src/lirc/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/lirc/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -12,5 +12,5 @@
 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS}  ${DBUS_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS}   -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  -llirc_client
--- a/src/m3u/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/m3u/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -8,5 +8,5 @@
 plugindir := ${plugindir}/${CONTAINER_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../.. -Wall
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../.. -Wall
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS}
--- a/src/madplug/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/madplug/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -14,6 +14,6 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} ${MAD_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} ${MAD_CFLAGS} -I../..
 LDFLAGS += ${AUDLDFLAGS}
 LIBS += ${MAD_LIBS} -laudid3tag ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
--- a/src/mms/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/mms/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -7,6 +7,6 @@
 
 plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${MMS_CFLAGS} -I../.. -Wall
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${MMS_CFLAGS} -I../.. -Wall
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS} ${MMS_LIBS}
--- a/src/modplug/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/modplug/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -54,5 +54,5 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I.. -I../.. -I../../intl
-LIBS += ${MOWGLI_LIBS} ${DBUS_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  -lstdc++
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I.. -I../.. -I../../intl
+LIBS += ${MOWGLI_LIBS}  ${GTK_LIBS} ${GLIB_LIBS}  -lstdc++
--- a/src/modplug/gui/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/modplug/gui/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -10,4 +10,4 @@
 
 CFLAGS   += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../../..
+CPPFLAGS += ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../../..
--- a/src/musepack/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/musepack/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -8,5 +8,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CXXFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${TAGLIB_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${TAGLIB_CFLAGS} -I../..
 LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lmpcdec
--- a/src/neon/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/neon/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -9,5 +9,5 @@
 plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${NEON_CFLAGS} -I../.. -D_RB_USE_GLIB
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${NEON_CFLAGS} -I../.. -D_RB_USE_GLIB
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS} ${NEON_LIBS}
--- a/src/null/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/null/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -8,5 +8,5 @@
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}   ${MOWGLI_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} 
--- a/src/paranormal-ng/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/paranormal-ng/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -29,5 +29,5 @@
 plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} -I../.. -I.
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} -I../.. -I.
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS} ${SDL_LIBS} -lGL -lGLU
--- a/src/paranormal/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/paranormal/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -29,5 +29,5 @@
 plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} -I../.. -I.
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} -I../.. -I.
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS} ${SDL_LIBS}
--- a/src/pls/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/pls/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -7,5 +7,5 @@
 plugindir := ${plugindir}/${CONTAINER_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS}
--- a/src/projectm-1.0/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/projectm-1.0/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -10,5 +10,5 @@
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${GTKGLEXT_CFLAGS} ${LIBPROJECTM1_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${GTKGLEXT_CFLAGS} ${LIBPROJECTM1_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${GTKGLEXT_LIBS} ${LIBPROJECTM1_LIBS}
--- a/src/projectm/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/projectm/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -9,5 +9,5 @@
 plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} ${LIBPROJECTM_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} ${LIBPROJECTM_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${SDL_LIBS} ${LIBPROJECTM_LIBS} -lprojectM
--- a/src/scrobbler/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/scrobbler/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -19,5 +19,5 @@
 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${BEEP_DEFINES} ${CURL_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${BEEP_DEFINES} ${CURL_CFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${CURL_LIBS} ${MUSICBRAINZ_LIBS} ${MOWGLI_LIBS}
--- a/src/smb/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/smb/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -8,5 +8,5 @@
 plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS} -lsmbclient
--- a/src/sndfile/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/sndfile/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -9,5 +9,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${DBUS_CFLAGS} -I../.. 
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}   -I../.. 
 LIBS += ${MOWGLI_LIBS} ${SNDFILE_LIBS} ${GTK_LIBS} ${GLIB_LIBS} 
--- a/src/stdio/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/stdio/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -8,5 +8,5 @@
 plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS}
--- a/src/sun/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/sun/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -13,5 +13,5 @@
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} 
--- a/src/timidity/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/timidity/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -20,6 +20,6 @@
 
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -I./libtimidity
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -I./libtimidity
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
--- a/src/tta/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/tta/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -9,6 +9,6 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
 LDFLAGS += ${AUDLDFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -laudid3tag
--- a/src/vorbis/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/vorbis/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -11,5 +11,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
 LIBS += ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
--- a/src/wavpack/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/wavpack/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -9,7 +9,7 @@
 
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${WAVPACK_CFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS}  ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${WAVPACK_CFLAGS} -I../..
 CXXFLAGS += ${PLUGIN_CFLAGS}
 LDFLAGS += -lstdc++
 LIBS += ${WAVPACK_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
--- a/src/wma/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/wma/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -27,5 +27,5 @@
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${SIMD_CFLAGS} -I../.. -I./libffwma -std=c99 ${GCC42_CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${SIMD_CFLAGS} -I../.. -I./libffwma -std=c99 ${GCC42_CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} 
--- a/src/xspf/Makefile	Thu Apr 17 05:19:51 2008 +0300
+++ b/src/xspf/Makefile	Thu Apr 17 05:34:30 2008 +0300
@@ -8,5 +8,5 @@
 plugindir := ${plugindir}/${CONTAINER_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../..
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${XML_LIBS}