# HG changeset patch
# User giacomo
# Date 1170173083 28800
# Node ID 550c9e382cf8c8cca80e8d757ed86e8d960496cc
# Parent  8182837f7a82998d715c2c9b0fe79d4c7ca28a73
[svn] - splitted GTK_CFLAGS in GTK_CFLAGS, GLIB_CFLAGS and PANGO_CFLAGS, splitted GTK_LIBS in GTK_LIBS, GLIB_LIBS, PANGO_LIBS

diff -r 8182837f7a82 -r 550c9e382cf8 ChangeLog
--- a/ChangeLog	Mon Jan 29 18:35:59 2007 -0800
+++ b/ChangeLog	Tue Jan 30 08:04:43 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-30 02:35:59 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [1240]
+  - don't percent encode urls beginning with http:// or https:// for now.
+  
+  trunk/src/xspf/xspf.c |   10 ++++++++--
+  1 file changed, 8 insertions(+), 2 deletions(-)
+
+
 2007-01-30 01:47:57 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1238]
   - build fix. adjust prototypes to new input API.
diff -r 8182837f7a82 -r 550c9e382cf8 configure.ac
--- a/configure.ac	Mon Jan 29 18:35:59 2007 -0800
+++ b/configure.ac	Tue Jan 30 08:04:43 2007 -0800
@@ -109,9 +109,19 @@
 
 dnl Check for GTK/GLib/GThread/Pango
 
-PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.6.0 gtk+-2.0 >= 2.6.0 gthread-2.0 pango],
-    [ADD_PC_REQUIRES([glib-2.0 >= 2.6.0, gtk+-2.0 >= 2.6.0])],
-    [AC_MSG_ERROR([Cannot find glib2/gtk2/pango])]
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0 gthread-2.0],
+    [ADD_PC_REQUIRES([glib-2.0 >= 2.6.0])],
+    [AC_MSG_ERROR([Cannot find glib2 >= 2.6.0])]
+)
+
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.6.0],
+    [ADD_PC_REQUIRES([gtk+-2.0 >= 2.6.0])],
+    [AC_MSG_ERROR([Cannot find gtk2 >= 2.6.0])]
+)
+
+PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0],
+    [ADD_PC_REQUIRES([pango >= 1.8.0])],
+    [AC_MSG_ERROR([Cannot find pango >= 1.8.0])]
 )
 
 dnl Check for libglade
diff -r 8182837f7a82 -r 550c9e382cf8 mk/rules.mk.in
--- a/mk/rules.mk.in	Mon Jan 29 18:35:59 2007 -0800
+++ b/mk/rules.mk.in	Tue Jan 30 08:04:43 2007 -0800
@@ -234,6 +234,8 @@
 PACKAGE_STRING ?= @PACKAGE_STRING@
 PACKAGE_TARNAME ?= @PACKAGE_TARNAME@
 PACKAGE_VERSION ?= @PACKAGE_VERSION@
+PANGO_CFLAGS ?= @PANGO_CFLAGS@
+PANGO_LIBS ?= @PANGO_LIBS@
 PATH_SEPARATOR ?= @PATH_SEPARATOR@
 PC_REQUIRES ?= @PC_REQUIRES@
 PKG_CONFIG ?= @PKG_CONFIG@
diff -r 8182837f7a82 -r 550c9e382cf8 src/CoreAudio/Makefile
--- a/src/CoreAudio/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/CoreAudio/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,11 +7,11 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) -Wl,-framework,CoreAudio
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -Wl,-framework,CoreAudio
 SOURCES = coreaudio.c mixer.c about.c configure.c audio.c init.c convert.c dbconvert.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../..intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../..intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/OSS/Makefile
--- a/src/OSS/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/OSS/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,11 +7,11 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(OSS_LIBS) $(GTK_LIBS)
+LIBADD = $(OSS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 SOURCES = OSS.c mixer.c about.c configure.c audio.c init.c convert.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/aac/src/Makefile
--- a/src/aac/src/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/aac/src/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,13 +7,13 @@
 
 # override objective make's LIBDIR
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
-
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 LDFLAGS += ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a -lstdc++
 
 SOURCES = libmp4.c mp4_utils.c aac_utils.c tagging_mp4.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(GTK_CFLAGS) -I../../.. -I../include -I../libfaad -I../mp4ff
+CFLAGS += $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -I../include -I../libfaad -I../mp4ff
 
 include ../../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/adplug/Makefile
--- a/src/adplug/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/adplug/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -6,15 +6,15 @@
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-LIBADD = ./core/libadplugcore.a $(BINIO_LIBS) -lstdc++
+LIBADD = ./core/libadplugcore.a $(BINIO_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++
 
 SOURCES = adplug-xmms.cc
 
 OBJECTS = ${SOURCES:.cc=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BINIO_CFLAGS) \
 	-I../../intl -I../.. -I./core
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BINIO_CFLAGS) \
 	-I../../intl -I../.. -I./core
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/alac/Makefile
--- a/src/alac/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/alac/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -3,12 +3,13 @@
 
 OBJECTIVE_LIBS = libalac$(SHARED_SUFFIX)
 
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
 SOURCES = alac.c demux.c plugin.c stream.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/alarm/Makefile
--- a/src/alarm/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/alarm/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,11 +7,11 @@
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBADD += $(GTK_LIBS)
+LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = alarm.c interface.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/alsa/Makefile
--- a/src/alsa/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/alsa/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,12 +7,12 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(ALSA_LIBS) -lpthread
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ALSA_LIBS) -lpthread
 SOURCES = alsa.c about.c audio.c configure.c init.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ALSA_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ALSA_CFLAGS) \
 	-I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/amidi-plug/Makefile
--- a/src/amidi-plug/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/amidi-plug/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -14,7 +14,7 @@
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
+LIBADD = $(GTK_LIBS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
 SOURCES = 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 \
@@ -22,7 +22,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \
           -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/aosd/Makefile
--- a/src/aosd/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/aosd/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,12 +7,12 @@
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 SOURCES = aosd.c aosd_osd.c aosd_style.c aosd_ui.c aosd_cfg.c ghosd.c ghosd-text.c ghosd-main.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) \
 	-I../../intl -I../.. -I..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/arts/Makefile
--- a/src/arts/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/arts/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -9,8 +9,8 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(ARTSC_CFLAGS) -I../../intl -I../..
-LIBADD = $(GTK_LIBS) $(ARTSC_LIBS) -lpthread
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -Wall $(ARTSC_CFLAGS) -I../../intl -I../..
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ARTSC_LIBS) -lpthread
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/audiocompress/Makefile
--- a/src/audiocompress/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/audiocompress/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,11 +5,11 @@
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = compress.c audacious-glue.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/blur_scope/Makefile
--- a/src/blur_scope/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/blur_scope/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,12 +5,12 @@
 
 LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = blur_scope.c config.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/cdaudio/Makefile
--- a/src/cdaudio/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/cdaudio/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -3,12 +3,13 @@
 
 OBJECTIVE_LIBS = libcdaudio$(SHARED_SUFFIX)
 
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
 SOURCES = cdaudio.c cddb.c cdinfo.c configure.c http.c 
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/console/Makefile
--- a/src/console/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/console/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -59,8 +59,8 @@
 
 OBJECTS = ${SOURCES:.cxx=.o}
 
-LIBADD += -lz $(GTK_LIBS) -lstdc++
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+LIBADD += -lz $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/cue/Makefile
--- a/src/cue/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/cue/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/curl/Makefile
--- a/src/curl/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/curl/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,11 +7,11 @@
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBADD += $(GTK_LIBS) $(CURL_LIBS)
+LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS)
 
 SOURCES = curl.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/disk_writer/Makefile
--- a/src/disk_writer/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/disk_writer/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,11 +5,11 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 SOURCES = disk_writer.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/echo_plugin/Makefile
--- a/src/echo_plugin/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/echo_plugin/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,11 +5,11 @@
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = echo.c gui.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/esd/Makefile
--- a/src/esd/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/esd/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,12 +7,12 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(ESD_LIBS) $(OSS_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ESD_LIBS) $(OSS_LIBS)
 SOURCES = esd.c mixer.c about.c configure.c audio.c init.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ESD_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ESD_CFLAGS) \
 	-I../../intl -I../.. -I..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/evdev-plug/Makefile
--- a/src/evdev-plug/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/evdev-plug/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,12 +7,12 @@
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 SOURCES = ed.c ed_ui.c ed_internals.c ed_bindings_store.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) \
 	-I../../intl -I../.. -I..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/flac112/Makefile
--- a/src/flac112/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/flac112/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -17,7 +17,7 @@
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-LIBADD = $(LIBFLAC_LIBS)  -L./plugin_common -lplugin_common
+LIBADD = $(LIBFLAC_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -L./plugin_common -lplugin_common
 
 SOURCES = \
 	charset.c \
@@ -32,6 +32,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS)
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS)
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/flac113/Makefile
--- a/src/flac113/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/flac113/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -17,7 +17,7 @@
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-LIBADD = $(LIBFLAC_LIBS)  -L./plugin_common -lplugin_common
+LIBADD = $(LIBFLAC_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -L./plugin_common -lplugin_common
 
 SOURCES = \
 	charset.c \
@@ -32,6 +32,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS)
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS)
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/jack/Makefile
--- a/src/jack/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/jack/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,8 +7,8 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(SAMPLERATE_CFLAGS) -I../../intl -I../..
-LIBADD = $(GTK_LIBS) $(JACK_LIBS) $(SAMPLERATE_LIBS) -lpthread
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -Wall $(SAMPLERATE_CFLAGS) -I../../intl -I../..
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(JACK_LIBS) $(SAMPLERATE_LIBS) -lpthread
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/ladspa/Makefile
--- a/src/ladspa/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/ladspa/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,11 +5,11 @@
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = ladspa.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/lirc/Makefile
--- a/src/lirc/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/lirc/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,10 +5,10 @@
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBADD = -llirc_client
+LIBADD = -llirc_client $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 SOURCES = about.c lirc.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/m3u/Makefile
--- a/src/m3u/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/m3u/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/metronom/Makefile
--- a/src/metronom/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/metronom/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -3,12 +3,13 @@
 
 OBJECTIVE_LIBS = libmetronom$(SHARED_SUFFIX)
 
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
 SOURCES = metronom.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/mms/Makefile
--- a/src/mms/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/mms/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -10,10 +10,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(MMS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(MMS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
-LIBADD = $(GTK_LIBS) $(MMS_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(MMS_LIBS)
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/modplug/Makefile
--- a/src/modplug/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/modplug/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -6,9 +6,9 @@
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I.. -I../.. -I../../intl
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I.. -I../.. -I../../intl
-LIBADD  = $(GTK_LIBS) -lstdc++ ./archive/libarchive.a ./gui/libgui.a
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I.. -I../.. -I../../intl
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I.. -I../.. -I../../intl
+LIBADD  = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++ ./archive/libarchive.a ./gui/libgui.a
 SOURCES.plugin  = plugin.cxx modplugbmp.cxx
 SOURCES.core = tables.cxx         \
                sndmix.cxx         \
diff -r 8182837f7a82 -r 550c9e382cf8 src/modplug/archive/Makefile
--- a/src/modplug/archive/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/modplug/archive/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-CXXFLAGS += $(PICFLAGS) -I../../.. $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS)
+CXXFLAGS += $(PICFLAGS) -I../../.. $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(AUDACIOUS_CFLAGS)
 
 OBJECTIVE_LIBS_NOINST = libarchive.a
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/modplug/gui/Makefile
--- a/src/modplug/gui/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/modplug/gui/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -1,8 +1,8 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-CFLAGS   += $(PICFLAGS) $(GTK_CFLAGS) -I../../..
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../..
+CFLAGS   += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../..
 
 OBJECTIVE_LIBS_NOINST = libgui.a
 SOURCES = main.cxx support.cxx interface.cxx callbacks.cxx
diff -r 8182837f7a82 -r 550c9e382cf8 src/mpg123/Makefile
--- a/src/mpg123/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/mpg123/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -13,9 +13,9 @@
 
 OBJECTS = ${SOURCES:.c=.o} tag_c_hacked.o
 
-CFLAGS   += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) $(LIBNMS_CFLAGS) -I../../intl -I../..
-CXXFLAGS += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS   += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) $(LIBNMS_CFLAGS) -I../../intl -I../..
+CXXFLAGS += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
-LIBADD = -ltag_c $(GTK_LIBS) $(TAGLIB_LIBS) $(LIBNMS_LIBS)
+LIBADD = -ltag_c $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(TAGLIB_LIBS) $(LIBNMS_LIBS)
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/musepack/Makefile
--- a/src/musepack/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/musepack/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,10 +7,10 @@
 
 SOURCES = libmpc.cxx
 
-LIBADD = -lmpcdec $(TAGLIB_LIBS) $(GTK_LIBS)
+LIBADD = -lmpcdec $(TAGLIB_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 OBJECTS = ${SOURCES:.cxx=.o}
 
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) -I../../intl -I../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(TAGLIB_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/paranormal/Makefile
--- a/src/paranormal/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/paranormal/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,7 +7,7 @@
 
 LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(XML_LIBS) $(SDL_LIBS) libcalc/libcalc.a
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(SDL_LIBS) libcalc/libcalc.a
 
 SOURCES =			\
 	actuators.c		\
@@ -28,6 +28,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/pls/Makefile
--- a/src/pls/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/pls/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/projectm/Makefile
--- a/src/projectm/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/projectm/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,12 +5,12 @@
 
 LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(SDL_LIBS) $(LIBPROJECTM_LIBS) -lprojectM
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(SDL_LIBS) $(LIBPROJECTM_LIBS) -lprojectM
 
 SOURCES = main.c video_init.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) $(LIBPROJECTM_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) $(LIBPROJECTM_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/pulse_audio/Makefile
--- a/src/pulse_audio/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/pulse_audio/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,11 +5,11 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) -lpulse
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lpulse
 SOURCES = pulse_audio.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/rocklight/Makefile
--- a/src/rocklight/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/rocklight/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,12 +5,12 @@
 
 LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = rocklight.c thinklight.c sysled.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/rovascope/Makefile
--- a/src/rovascope/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/rovascope/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,7 +7,7 @@
 
 LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(XML_LIBS) $(SDL_LIBS) libcalc/libcalc.a
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(SDL_LIBS) libcalc/libcalc.a
 
 SOURCES =			\
 	actuators.c		\
@@ -27,6 +27,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/scrobbler/Makefile
--- a/src/scrobbler/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/scrobbler/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -12,7 +12,7 @@
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBADD += $(GTK_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS)
+LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS)
 
 SOURCES = 			\
 	fmt.c			\
@@ -24,7 +24,7 @@
 	hatena.c		\
 	plugin.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/sexypsf/Makefile
--- a/src/sexypsf/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/sexypsf/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -3,6 +3,7 @@
 
 OBJECTIVE_LIBS = libsexypsf$(SHARED_SUFFIX)
 
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
 SOURCES = \
@@ -23,7 +24,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -Ispu/ -I.
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -Ispu/ -I.
 
 include ../../mk/objective.mk
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/sid/Makefile
--- a/src/sid/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/sid/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -9,15 +9,15 @@
 EXTRA_DIST = xmms-sid-logo.xpm
 
 # Generals
-CFLAGS   += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../intl -I../..
-CXXFLAGS  += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS   += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
+CXXFLAGS  += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 # Generated libraries
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
 LDFLAGS += $(BUILDERS_LDFLAGS)
-LIBADD  = $(SIDPLAY1_LDADD) $(SIDPLAY2_LDADD) $(RESID_LDADD) $(HARDSID_LDADD) $(GTK_LIBS) -lstdc++
+LIBADD  = $(SIDPLAY1_LDADD) $(SIDPLAY2_LDADD) $(RESID_LDADD) $(HARDSID_LDADD) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++
 SOURCES =	\
 	xs_init.c	\
 	xs_about.c	\
diff -r 8182837f7a82 -r 550c9e382cf8 src/song_change/Makefile
--- a/src/song_change/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/song_change/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,12 +5,12 @@
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = song_change.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(BEEP_DEFINES) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(BEEP_DEFINES) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/spectrum/Makefile
--- a/src/spectrum/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/spectrum/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,12 +5,12 @@
 
 LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = spectrum.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/statusicon/Makefile
--- a/src/statusicon/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/statusicon/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,12 +7,12 @@
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(GDKX11_LIBS)
+LIBADD = $(GTK_LIBS) $(GDKX11_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 SOURCES = si.c si_ui.c gtktrayicon-x11.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GDKX11_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GDKX11_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) \
 	-I../../intl -I../.. -I..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/stdio/Makefile
--- a/src/stdio/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/stdio/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -10,10 +10,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/stereo_plugin/Makefile
--- a/src/stereo_plugin/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/stereo_plugin/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,11 +5,11 @@
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = stereo.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/sun/Makefile
--- a/src/sun/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/sun/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -11,8 +11,8 @@
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 OBJECTIVE_LIBS = libsun$(SHARED_SUFFIX)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
-LIBADD = $(GTK_LIBS)
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 SOURCES= $(sunsources)
 OBJECTS= ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/timidity/libtimidity/Makefile
--- a/src/timidity/libtimidity/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/timidity/libtimidity/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -17,7 +17,7 @@
 	tables.c \
 	timidity.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../..
+CFLAGS += $(PICFLAGS) -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/timidity/src/Makefile
--- a/src/timidity/src/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/timidity/src/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,7 +5,7 @@
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-LIBADD = ../libtimidity/libtimidity.a
+LIBADD = ../libtimidity/libtimidity.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = \
 	callbacks.c \
@@ -14,6 +14,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../.. -I../libtimidity
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -I../libtimidity
 
 include ../../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/tonegen/Makefile
--- a/src/tonegen/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/tonegen/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -3,12 +3,13 @@
 
 OBJECTIVE_LIBS = libtonegen$(SHARED_SUFFIX)
 
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
 SOURCES = tonegen.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/tta/Makefile
--- a/src/tta/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/tta/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -9,8 +9,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
-LIBADD = -lid3tag
+LIBADD = -lid3tag $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
-include ../../mk/objective.mk
\ No newline at end of file
+include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/voice_removal/Makefile
--- a/src/voice_removal/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/voice_removal/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -5,11 +5,11 @@
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = voice_removal.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/vorbis/Makefile
--- a/src/vorbis/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/vorbis/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -9,8 +9,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-LIBADD = $(OGG_VORBIS_LIBS)
+LIBADD = $(OGG_VORBIS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/wav/Makefile
--- a/src/wav/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/wav/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,9 +7,9 @@
 
 SOURCES = wav$(WAV_SNDFILE).c
 
-LIBADD = -L/usr/local/lib $(SNDFILE_LIBS)
+LIBADD = -L/usr/local/lib $(SNDFILE_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/wavpack/Makefile
--- a/src/wavpack/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/wavpack/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,9 +7,9 @@
 
 SOURCES = tags.cxx ui.cxx libwavpack.cxx
 
-LIBADD = -L/usr/local/lib $(WAVPACK_LIBS)
+LIBADD = -L/usr/local/lib $(WAVPACK_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(WAVPACK_CFLAGS) -I../../intl -I../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(WAVPACK_CFLAGS) -I../../intl -I../..
 
 LDFLAGS += -lstdc++
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/wma/Makefile
--- a/src/wma/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/wma/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -7,12 +7,12 @@
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-LIBADD = ./libffwma/libffwma.a
+LIBADD = ./libffwma/libffwma.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 SOURCES = wma.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../.. -I./libffwma -std=c99
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../.. -I./libffwma -std=c99
 
 include ../../mk/objective.mk
diff -r 8182837f7a82 -r 550c9e382cf8 src/wma/libffwma/Makefile
--- a/src/wma/libffwma/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/wma/libffwma/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -13,7 +13,7 @@
 		parser.c simple_idct.c simple_idct.h \
 		utils.h utils.c wmadata.h wmadec.c mem.c uri.c
 
-CFLAGS+=	$(PICFLAGS) $(GTK_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../..
+CFLAGS+=	$(PICFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../..
 
 OBJECTS=${SOURCES:.c=.o}
 
diff -r 8182837f7a82 -r 550c9e382cf8 src/xspf/Makefile
--- a/src/xspf/Makefile	Mon Jan 29 18:35:59 2007 -0800
+++ b/src/xspf/Makefile	Tue Jan 30 08:04:43 2007 -0800
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) -I../../intl -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
-LIBADD = $(GTK_LIBS) $(XML_LIBS)
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS)
 
 include ../../mk/objective.mk