diff -p -up audacious-plugins-2.1-beta1/src/adplug/Makefile.linking audacious-plugins-2.1-beta1/src/adplug/Makefile

--- audacious-plugins-2.1-beta1/src/adplug/Makefile.linking	2009-06-26 19:51:05.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/adplug/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -60,4 +60,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN

 CFLAGS += ${PLUGIN_CFLAGS}

 CXXFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${BINIO_CFLAGS} -I../.. -I./core -Dstricmp=strcasecmp

-LIBS += ${BINIO_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}

+LIBS += ${BINIO_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lstdc++ -lm

diff -p -up audacious-plugins-2.1-beta1/src/bluetooth/Makefile.linking audacious-plugins-2.1-beta1/src/bluetooth/Makefile

--- audacious-plugins-2.1-beta1/src/bluetooth/Makefile.linking	2009-06-26 19:51:05.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/bluetooth/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -14,5 +14,5 @@ marshal.c:

 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${DBUS_GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. ${BLUEZ_CFLAGS}

-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${BLUEZ_LIBS}

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${BLUEZ_LIBS} ${DBUS_LIBS}

diff -p -up audacious-plugins-2.1-beta1/src/hotkey/Makefile.linking audacious-plugins-2.1-beta1/src/hotkey/Makefile

--- audacious-plugins-2.1-beta1/src/hotkey/Makefile.linking	2009-06-26 19:51:05.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/hotkey/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -9,4 +9,4 @@ plugindir := ${plugindir}/${GENERAL_PLUG

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS}  -I../.. -I..

-LIBS += ${GLIB_LIBS}  ${GTK_LIBS}

+LIBS += ${GLIB_LIBS}  ${GTK_LIBS} -lX11

diff -p -up audacious-plugins-2.1-beta1/src/jack/Makefile.linking audacious-plugins-2.1-beta1/src/jack/Makefile

--- audacious-plugins-2.1-beta1/src/jack/Makefile.linking	2009-06-26 19:51:05.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/jack/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -11,4 +11,4 @@ plugindir := ${plugindir}/${OUTPUT_PLUGI

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${SAMPLERATE_CFLAGS} -I../..

-LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${JACK_LIBS} ${SAMPLERATE_LIBS} -pthread

+LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${JACK_LIBS} ${SAMPLERATE_LIBS} -pthread -lm

diff -p -up audacious-plugins-2.1-beta1/src/ladspa/Makefile.linking audacious-plugins-2.1-beta1/src/ladspa/Makefile

--- audacious-plugins-2.1-beta1/src/ladspa/Makefile.linking	2009-06-26 19:51:05.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/ladspa/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -9,4 +9,4 @@ plugindir := ${plugindir}/${EFFECT_PLUGI

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..

-LIBS += ${GTK_LIBS} ${GLIB_LIBS} 

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} -ldl

diff -p -up audacious-plugins-2.1-beta1/src/modplug/Makefile.linking audacious-plugins-2.1-beta1/src/modplug/Makefile

--- audacious-plugins-2.1-beta1/src/modplug/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/modplug/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -53,4 +53,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN

 CFLAGS += ${PLUGIN_CFLAGS}

 CXXFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I.. -I../.. -I../../intl

-LIBS += ${MOWGLI_LIBS}  ${GTK_LIBS} ${GLIB_LIBS}  -lstdc++

+LIBS += ${MOWGLI_LIBS}  ${GTK_LIBS} ${GLIB_LIBS}  -lstdc++ -lm

diff -p -up audacious-plugins-2.1-beta1/src/musepack/Makefile.linking audacious-plugins-2.1-beta1/src/musepack/Makefile

--- audacious-plugins-2.1-beta1/src/musepack/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/musepack/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -9,4 +9,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN

 CXXFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${TAGLIB_CFLAGS} -I../..

-LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lmpcdec

+LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lmpcdec -lstdc++ -lm

diff -p -up audacious-plugins-2.1-beta1/src/projectm-1.0/Makefile.linking audacious-plugins-2.1-beta1/src/projectm-1.0/Makefile

--- audacious-plugins-2.1-beta1/src/projectm-1.0/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/projectm-1.0/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -14,4 +14,4 @@ LD = ${CXX}

 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}

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${SDL_LIBS} ${LIBPROJECTM1_LIBS} -lGL

diff -p -up audacious-plugins-2.1-beta1/src/sid/Makefile.linking audacious-plugins-2.1-beta1/src/sid/Makefile

--- audacious-plugins-2.1-beta1/src/sid/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/sid/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -26,4 +26,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN

 CFLAGS += ${PLUGIN_CFLAGS}

 CXXFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} -D_REENTRANT -I../.. -DAUDACIOUS_PLUGIN ${MOWGLI_CFLAGS} ${SIDPLAY1_CFLAGS} ${SIDPLAY2_CFLAGS} ${BUILDERS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}

-LIBS += ${BUILDERS_LDFLAGS} ${SIDPLAY1_LIBS} ${SIDPLAY2_LIBS} ${BUILDERS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} -lstdc++ -laudutil

+LIBS += ${BUILDERS_LDFLAGS} ${SIDPLAY1_LIBS} ${SIDPLAY2_LIBS} ${BUILDERS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} -lstdc++ -laudutil -lm

diff -p -up audacious-plugins-2.1-beta1/src/skins/Makefile.linking audacious-plugins-2.1-beta1/src/skins/Makefile

--- audacious-plugins-2.1-beta1/src/skins/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/skins/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -39,4 +39,4 @@ plugindir := ${plugindir}/${GENERAL_PLUG

 CFLAGS += ${PLUGIN_CFLAGS} ${BEEP_DEFINES}

 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} ${MOWGLI_LIBS}

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CAIRO_LIBS} ${PANGOCAIRO_LIBS} ${XRENDER_LIBS} ${XCOMPOSITE_LIBS} ${MOWGLI_LIBS} -lm

diff -p -up audacious-plugins-2.1-beta1/src/sndfile/Makefile.linking audacious-plugins-2.1-beta1/src/sndfile/Makefile

--- audacious-plugins-2.1-beta1/src/sndfile/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/sndfile/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -10,4 +10,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}   -I../.. 

-LIBS += ${MOWGLI_LIBS} ${SNDFILE_LIBS} ${GTK_LIBS} ${GLIB_LIBS} 

+LIBS += ${MOWGLI_LIBS} ${SNDFILE_LIBS} ${GTK_LIBS} ${GLIB_LIBS} -lm

diff -p -up audacious-plugins-2.1-beta1/src/sndstretch/Makefile.linking audacious-plugins-2.1-beta1/src/sndstretch/Makefile

--- audacious-plugins-2.1-beta1/src/sndstretch/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/sndstretch/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -10,4 +10,4 @@ plugindir := ${plugindir}/${EFFECT_PLUGI

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS}  -I../..

-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MOWGLI_LIBS} 

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MOWGLI_LIBS} -lm

diff -p -up audacious-plugins-2.1-beta1/src/spectrum/Makefile.linking audacious-plugins-2.1-beta1/src/spectrum/Makefile

--- audacious-plugins-2.1-beta1/src/spectrum/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/spectrum/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -9,4 +9,4 @@ plugindir := ${plugindir}/${VISUALIZATIO

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..

-LIBS += ${GTK_LIBS} ${GLIB_LIBS} 

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} -lm

diff -p -up audacious-plugins-2.1-beta1/src/statusicon/Makefile.linking audacious-plugins-2.1-beta1/src/statusicon/Makefile

--- audacious-plugins-2.1-beta1/src/statusicon/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/statusicon/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -12,4 +12,4 @@ plugindir := ${plugindir}/${GENERAL_PLUG

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..

-LIBS += ${GTK_LIBS} ${GLIB_LIBS} 

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} -lX11

diff -p -up audacious-plugins-2.1-beta1/src/tonegen/Makefile.linking audacious-plugins-2.1-beta1/src/tonegen/Makefile

--- audacious-plugins-2.1-beta1/src/tonegen/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/tonegen/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -9,4 +9,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN

 CFLAGS += ${PLUGIN_CFLAGS}

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..

-LIBS += ${GTK_LIBS} ${GLIB_LIBS} 

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} -lm

diff -p -up audacious-plugins-2.1-beta1/src/wma/Makefile.linking audacious-plugins-2.1-beta1/src/wma/Makefile

--- audacious-plugins-2.1-beta1/src/wma/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/wma/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -28,4 +28,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN

 CFLAGS += ${PLUGIN_CFLAGS}

 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} 

+LIBS += ${GTK_LIBS} ${GLIB_LIBS} -lm

diff -p -up audacious-plugins-2.1-beta1/src/xsf/Makefile.linking audacious-plugins-2.1-beta1/src/xsf/Makefile

--- audacious-plugins-2.1-beta1/src/xsf/Makefile.linking	2009-06-26 19:51:06.000000000 +0200

+++ audacious-plugins-2.1-beta1/src/xsf/Makefile	2009-07-01 13:11:23.000000000 +0200

@@ -13,4 +13,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN

 CFLAGS += ${PLUGIN_CFLAGS} -O0

 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -Ispu/ -I.

-LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lz

+LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lz -lm