Mercurial > audlegacy

changeset 1625:79891e2fd8a5 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - use $(SHARED_SUFFIX) - use $(PICFLAGS) - use $(PICLDFLAGS)
author nenolod
date Wed, 06 Sep 2006 13:21:40 -0700
parents d863bca9b6d7
children 83769dcca55e
files ChangeLog Plugins/Container/m3u/Makefile Plugins/Container/pls/Makefile Plugins/Container/xspf/Makefile Plugins/Effect/audiocompress/Makefile.in Plugins/Effect/ladspa/Makefile.in Plugins/Effect/stereo_plugin/Makefile.in Plugins/Effect/voice_removal/Makefile.in Plugins/General/lirc/Makefile.in Plugins/General/notify/Makefile Plugins/General/scrobbler/Makefile.in Plugins/General/song_change/Makefile.in Plugins/Input/aac/libfaad2/Makefile.in Plugins/Input/aac/mp4ff/Makefile.in Plugins/Input/aac/src/Makefile.in Plugins/Input/adplug/Makefile.in Plugins/Input/adplug/core/Makefile.in Plugins/Input/amidi-plug/Makefile.in Plugins/Input/amidi-plug/backend-alsa/Makefile.in Plugins/Input/amidi-plug/backend-dummy/Makefile.in Plugins/Input/amidi-plug/backend-fluidsynth/Makefile.in Plugins/Input/amidi-plug/pcfg/Makefile.in Plugins/Input/cdaudio/Makefile.in Plugins/Input/console/Makefile.in Plugins/Input/cue/Makefile Plugins/Input/flac/Makefile.in Plugins/Input/flac/plugin_common/Makefile.in Plugins/Input/modplug/Makefile.in Plugins/Input/modplug/archive/Makefile.in Plugins/Input/modplug/gui/Makefile.in Plugins/Input/mpg123/Makefile.in Plugins/Input/musepack/Makefile.in Plugins/Input/sexypsf/Makefile.in Plugins/Input/sid/Makefile.in Plugins/Input/timidity/libtimidity/Makefile.in Plugins/Input/timidity/src/Makefile.in Plugins/Input/tonegen/Makefile.in Plugins/Input/vorbis/Makefile.in Plugins/Input/wav/Makefile.in Plugins/Input/wma/Makefile.in Plugins/Input/wma/libffwma/Makefile.in Plugins/Output/OSS/Makefile.in Plugins/Output/alsa/Makefile.in Plugins/Output/arts/Makefile.in Plugins/Output/disk_writer/Makefile.in Plugins/Output/esd/Makefile.in Plugins/Output/jack/Makefile.in Plugins/Output/sun/Makefile.in Plugins/Visualization/blur_scope/Makefile.in Plugins/Visualization/paranormal/Makefile Plugins/Visualization/paranormal/pn/Makefile Plugins/Visualization/rocklight/Makefile.in libaudacious/Makefile.in libguess/Makefile.in librcd/Makefile.in mk/objective.mk
diffstat 56 files changed, 117 insertions(+), 108 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Sep 06 13:04:37 2006 -0700
+++ b/ChangeLog	Wed Sep 06 13:21:40 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-06 20:04:37 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2179]
+  - PICFLAGS should not call -shared/-bundle as some versions of GCC will misinterpret that. Only PICLDFLAGS should.
+  
+
+  Changes:        Modified:
+  +3 -3           trunk/configure.ac  
+
+
 2006-09-06 20:01:04 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2177]
   - add PICLDFLAGS, PICFLAGS, SHARED_SUFFIX identifiers
--- a/Plugins/Container/m3u/Makefile	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Container/m3u/Makefile	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libm3u.so
+OBJECTIVE_LIBS = libm3u$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(CONTAINER_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
 
 CXXFLAGS = $(CFLAGS)
 
--- a/Plugins/Container/pls/Makefile	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Container/pls/Makefile	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libpls.so
+OBJECTIVE_LIBS = libpls$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(CONTAINER_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
 
 CXXFLAGS = $(CFLAGS)
 
--- a/Plugins/Container/xspf/Makefile	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Container/xspf/Makefile	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libxspf.so
+OBJECTIVE_LIBS = libxspf$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(CONTAINER_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) -I../../../intl -I../../..
 
 CXXFLAGS = $(CFLAGS)
 
--- a/Plugins/Effect/audiocompress/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Effect/audiocompress/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libaudiocompress.so
+OBJECTIVE_LIBS = libaudiocompress$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 SOURCES = compress.c audacious-glue.c
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/Effect/ladspa/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Effect/ladspa/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libladspa.so
+OBJECTIVE_LIBS = libladspa$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 SOURCES = ladspa.c
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/Effect/stereo_plugin/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Effect/stereo_plugin/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libstereo.so
+OBJECTIVE_LIBS = libstereo$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 SOURCES = stereo.c
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/Effect/voice_removal/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Effect/voice_removal/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libvoice_removal.so
+OBJECTIVE_LIBS = libvoice_removal$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 SOURCES = voice_removal.c
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/General/lirc/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/General/lirc/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,14 +1,14 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = liblirc.so
+OBJECTIVE_LIBS = liblirc$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
 LIBADD = -llirc_client
 SOURCES = about.c lirc.c
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/General/notify/Makefile	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/General/notify/Makefile	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libnotify.so
+OBJECTIVE_LIBS = libnotify$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(LIBNOTIFY_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../.. -DDATA_DIR=\"$(datadir)\"
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(LIBNOTIFY_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../.. -DDATA_DIR=\"$(datadir)\"
 
 CXXFLAGS = $(CFLAGS)
 
--- a/Plugins/General/scrobbler/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/General/scrobbler/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -3,7 +3,7 @@
 
 SUBDIRS = 
 
-OBJECTIVE_LIBS = libscrobbler.so
+OBJECTIVE_LIBS = libscrobbler$(SHARED_SUFFIX)
 
 imagesdir = $(pkgdatadir)/images
 
@@ -23,7 +23,7 @@
 	scrobbler.c		\
 	xmms_scrobbler.c
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/General/song_change/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/General/song_change/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libsong_change.so
+OBJECTIVE_LIBS = libsong_change$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
 
@@ -11,6 +11,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(BEEP_DEFINES) $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(BEEP_DEFINES) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/aac/libfaad2/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../../mk/rules.mk
 include ../../../../mk/init.mk
 
-CFLAGS += -I../include -I../../../.. -I. -fPIC -DPIC
+CFLAGS += -I../include -I../../../.. -I. $(PICFLAGS)
 
 OBJECTIVE_LIBS_NOINST = libfaad.a
 
--- a/Plugins/Input/aac/mp4ff/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -8,6 +8,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC -DUSE_TAGGING=1 -fsigned-char -I../../../.. -I../../../../intl
+CFLAGS += $(PICFLAGS) -DUSE_TAGGING=1 -fsigned-char -I../../../.. -I../../../../intl
 
 include ../../../../mk/objective.mk
--- a/Plugins/Input/aac/src/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/aac/src/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,9 +1,9 @@
 include ../../../../mk/rules.mk
 include ../../../../mk/init.mk
 
-OBJECTIVE_LIBS = libaac.so
+OBJECTIVE_LIBS = libaac$(SHARED_SUFFIX)
 
-CFLAGS += -fPIC -DPIC
+CFLAGS += $(PICFLAGS)
 
 # override objective make's LIBDIR
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
--- a/Plugins/Input/adplug/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/adplug/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -2,7 +2,7 @@
 include ../../../mk/init.mk
 
 SUBDIRS = core
-OBJECTIVE_LIBS = libadplug.so
+OBJECTIVE_LIBS = libadplug$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -12,9 +12,9 @@
 
 OBJECTS = ${SOURCES:.cc=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(BINIO_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \
 	-I../../../intl -I../../.. -I./core
-CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(BINIO_CFLAGS) \
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \
 	-I../../../intl -I../../.. -I./core
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/adplug/core/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/adplug/core/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -18,8 +18,8 @@
 database.h players.h xsm.h adlibemu.h kemuopl.h dro.h dmo.h s3m.h temuopl.h \
 msc.h rix.h adl.h
 
-CXXFLAGS += -fPIC -DPIC $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp
-CFLAGS += -fPIC -DPIC $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp
+CXXFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp
+CFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp
 
 OBJECTS = ${SOURCES:.c=.o} ${SOURCES:.cpp=.o}
 
--- a/Plugins/Input/amidi-plug/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/amidi-plug/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libamidi-plug.so
+OBJECTIVE_LIBS = libamidi-plug$(SHARED_SUFFIX)
 SUBDIRS = pcfg @AMIDIPLUG_BACKENDS@
 
 noinst_HEADERS = amidi-plug.h i_backend.h i_midi.h i_midievent.h \
@@ -21,7 +21,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGDATADIR=\"$(AMIDIPLUGDATADIR)\" \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGDATADIR=\"$(AMIDIPLUGDATADIR)\" \
           -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/amidi-plug/backend-alsa/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-alsa/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -3,11 +3,11 @@
 
 noinst_HEADERS = b-alsa.h b-alsa-config.h backend-alsa-icon.xpm
 
-CFLAGS += -fPIC -DPIC $(GLIB_CFLAGS) $(ALSA_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(ALSA_CFLAGS) -I../../../../intl -I../../../..
 
 libdir = $(AMIDIPLUGDATADIR)
 
-OBJECTIVE_LIBS = ap-alsa.so
+OBJECTIVE_LIBS = ap-alsa$(SHARED_SUFFIX)
 
 LIBADD = $(GLIB_LIBS) $(ALSA_LIBS) ../pcfg/libpcfg.a
 SOURCES = b-alsa.c
--- a/Plugins/Input/amidi-plug/backend-dummy/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-dummy/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -3,11 +3,11 @@
 
 noinst_HEADERS = b-dummy.h b-dummy-config.h backend-dummy-icon.xpm
 
-CFLAGS += -fPIC -DPIC $(GLIB_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../../../intl -I../../../..
 
 libdir = $(AMIDIPLUGDATADIR)
 
-OBJECTIVE_LIBS = ap-dummy.so
+OBJECTIVE_LIBS = ap-dummy$(SHARED_SUFFIX)
 
 LIBADD = $(GLIB_LIBS) ../pcfg/libpcfg.a
 SOURCES = b-dummy.c
--- a/Plugins/Input/amidi-plug/backend-fluidsynth/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-fluidsynth/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -3,11 +3,11 @@
 
 noinst_HEADERS = b-fluidsynth.h b-fluidsynth-config.h backend-fluidsynth-icon.xpm
 
-CFLAGS += -fPIC -DPIC $(GLIB_CFLAGS) $(FLUIDSYNTH_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(FLUIDSYNTH_CFLAGS) -I../../../../intl -I../../../..
 
 libdir = $(AMIDIPLUGDATADIR)
 
-OBJECTIVE_LIBS = ap-fluidsynth.so
+OBJECTIVE_LIBS = ap-fluidsynth$(SHARED_SUFFIX)
 
 LIBADD = -lm $(GLIB_LIBS) $(FLUIDSYNTH_LIBS) ../pcfg/libpcfg.a
 SOURCES = b-fluidsynth.c
--- a/Plugins/Input/amidi-plug/pcfg/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/amidi-plug/pcfg/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -3,7 +3,7 @@
 
 noinst_HEADERS = i_pcfg.h
 
-CFLAGS += -fPIC -DPIC $(GLIB_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../../../intl -I../../../..
 
 OBJECTIVE_LIBS_NOINST = libpcfg.a
 
--- a/Plugins/Input/cdaudio/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/cdaudio/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libcdaudio.so
+OBJECTIVE_LIBS = libcdaudio$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -9,6 +9,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC @GTK_CFLAGS@ -I../../../intl -I../../.. -I../..
+CFLAGS += $(PICFLAGS) @GTK_CFLAGS@ -I../../../intl -I../../.. -I../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/console/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/console/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libconsole.so
+OBJECTIVE_LIBS = libconsole$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -44,6 +44,6 @@
 OBJECTS = ${SOURCES:.cpp=.o}
 
 LIBADD += -lz $(GTK_LIBS) -lstdc++
-CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/cue/Makefile	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/cue/Makefile	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libcuesheet.so
+OBJECTIVE_LIBS = libcuesheet$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
 
 CXXFLAGS = $(CFLAGS)
 
--- a/Plugins/Input/flac/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/flac/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -14,7 +14,7 @@
 	grabbag.h \
 	replaygain_synthesis.h
 
-OBJECTIVE_LIBS = libflac.so
+OBJECTIVE_LIBS = libflac$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -34,6 +34,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. $(LIBFLAC_CFLAGS)
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../.. $(LIBFLAC_CFLAGS)
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/flac/plugin_common/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../../mk/rules.mk
 include ../../../../mk/init.mk
 
-CFLAGS += -fPIC -DPIC -I.. -I../../../..
+CFLAGS += $(PICFLAGS) -I.. -I../../../..
 
 OBJECTIVE_LIBS_NOINST = libplugin_common.a
 
--- a/Plugins/Input/modplug/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/modplug/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,12 +1,12 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libmodplug.so
+OBJECTIVE_LIBS = libmodplug$(SHARED_SUFFIX)
 SUBDIRS = archive gui
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I.. -I../../.. -I../../../intl
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I.. -I../../.. -I../../../intl
 LIBADD  = $(GTK_LIBS) -lstdc++ -lmodplug ./archive/libarchive.a ./gui/libgui.a
 SOURCES  = plugin.cpp modplugbmp.cpp
 
--- a/Plugins/Input/modplug/archive/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/modplug/archive/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../../mk/rules.mk
 include ../../../../mk/init.mk
 
-CXXFLAGS += -fPIC -DPIC -I../../..
+CXXFLAGS += $(PICFLAGS) -I../../..
 
 OBJECTIVE_LIBS_NOINST = libarchive.a
 
--- a/Plugins/Input/modplug/gui/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/modplug/gui/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,8 +1,8 @@
 include ../../../../mk/rules.mk
 include ../../../../mk/init.mk
 
-CFLAGS   += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
-CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS   += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../..
 
 OBJECTIVE_LIBS_NOINST = libgui.a
 SOURCES = main.cpp support.cpp interface.cpp callbacks.cpp
--- a/Plugins/Input/mpg123/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/mpg123/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libmpg123.so
+OBJECTIVE_LIBS = libmpg123$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -13,8 +13,8 @@
 
 OBJECTS = ${SOURCES:.c=.o} tag_c_hacked.o
 
-CFLAGS   += -UPSYCHO -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
-CXXFLAGS += -UPSYCHO -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS   += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CXXFLAGS += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
 
 LIBADD = -ltag_c $(GTK_LIBS) $(TAGLIB_LIBS)
 
--- a/Plugins/Input/musepack/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/musepack/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libmpc.so
+OBJECTIVE_LIBS = libmpc$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -11,6 +11,6 @@
 
 OBJECTS = ${SOURCES:.cpp=.o}
 
-CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) -I../../../intl -I../../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/sexypsf/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/sexypsf/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libsexypsf.so
+OBJECTIVE_LIBS = libsexypsf$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -23,7 +23,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -Wno-nonnull -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. -Ispu/ -I.
+CFLAGS += -Wno-nonnull $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../.. -Ispu/ -I.
 
 include ../../../mk/objective.mk
 
--- a/Plugins/Input/sid/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/sid/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libsid.so
+OBJECTIVE_LIBS = libsid$(SHARED_SUFFIX)
 
 ###
 ### Source targets
@@ -9,8 +9,8 @@
 EXTRA_DIST = xmms-sid-logo.xpm
 
 # Generals
-CFLAGS   += -fPIC -DPIC -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../../intl -I../../..
-CXXFLAGS  += -fPIC -DPIC -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) -I../../../intl -I../../..
+CXXFLAGS  += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 # Generated libraries
 
--- a/Plugins/Input/timidity/libtimidity/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/timidity/libtimidity/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -17,7 +17,7 @@
 	tables.c \
 	timidity.c
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/Input/timidity/src/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/timidity/src/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../../mk/rules.mk
 include ../../../../mk/init.mk
 
-OBJECTIVE_LIBS = libtimidity.so
+OBJECTIVE_LIBS = libtimidity$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -14,6 +14,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../libtimidity
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../libtimidity
 
 include ../../../../mk/objective.mk
--- a/Plugins/Input/tonegen/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/tonegen/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libtonegen.so
+OBJECTIVE_LIBS = libtonegen$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -9,6 +9,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC @GTK_CFLAGS@ -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) @GTK_CFLAGS@ -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/vorbis/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/vorbis/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libvorbis.so
+OBJECTIVE_LIBS = libvorbis$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -11,6 +11,6 @@
 
 LIBADD = $(OGG_VORBIS_LIBS)
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../.. -I../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/wav/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/wav/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libwav.so
+OBJECTIVE_LIBS = libwav$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
@@ -9,7 +9,7 @@
 
 LIBADD = -L/usr/local/lib $(SNDFILE_LIBS)
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/Input/wma/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/wma/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libwma.so
+OBJECTIVE_LIBS = libwma$(SHARED_SUFFIX)
 
 SUBDIRS = libffwma
 
@@ -13,6 +13,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. -I./libffwma -std=c99
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../.. -I./libffwma -std=c99
 
 include ../../../mk/objective.mk
--- a/Plugins/Input/wma/libffwma/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Input/wma/libffwma/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -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+=	-fPIC -DPIC $(GTK_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../../.. -I../../../../intl
+CFLAGS+=	$(PICFLAGS) $(GTK_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../../.. -I../../../../intl
 
 OBJECTS=${SOURCES:.c=.o}
 
--- a/Plugins/Output/OSS/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Output/OSS/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libOSS.so
+OBJECTIVE_LIBS = libOSS$(SHARED_SUFFIX)
 
 noinst_HEADERS = OSS.h soundcard.h
 
@@ -12,6 +12,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Output/alsa/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Output/alsa/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libALSA.so
+OBJECTIVE_LIBS = libALSA$(SHARED_SUFFIX)
 
 noinst_HEADERS = alsa.h
 
@@ -12,7 +12,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ALSA_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ALSA_CFLAGS) \
 	-I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Output/arts/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Output/arts/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -5,11 +5,11 @@
 
 SOURCES = arts.c configure.c audio.c convert.c
 
-OBJECTIVE_LIBS = libarts.so
+OBJECTIVE_LIBS = libarts$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -Wall $(ARTSC_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(ARTSC_CFLAGS) -I../../../intl -I../../..
 LIBADD = $(GTK_LIBS) $(ARTSC_LIBS) -lpthread
 
 OBJECTS = ${SOURCES:.c=.o}
--- a/Plugins/Output/disk_writer/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Output/disk_writer/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libdisk_writer.so
+OBJECTIVE_LIBS = libdisk_writer$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
@@ -10,6 +10,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Output/esd/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Output/esd/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libESD.so
+OBJECTIVE_LIBS = libESD$(SHARED_SUFFIX)
 
 noinst_HEADERS = esdout.h
 
@@ -12,7 +12,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ESD_CFLAGS) \
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ESD_CFLAGS) \
 	-I../../../intl -I../../.. -I..
 
 include ../../../mk/objective.mk
--- a/Plugins/Output/jack/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Output/jack/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -3,11 +3,11 @@
 
 SOURCES = jack.c configure.c bio2jack.c
 
-OBJECTIVE_LIBS = libjackout.so
+OBJECTIVE_LIBS = libjackout$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -Wall $(SAMPLERATE_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(SAMPLERATE_CFLAGS) -I../../../intl -I../../..
 LIBADD = $(GTK_LIBS) $(JACK_LIBS) $(SAMPLERATE_LIBS) -lpthread
 
 OBJECTS = ${SOURCES:.c=.o}
--- a/Plugins/Output/sun/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Output/sun/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -9,9 +9,9 @@
 		about.c
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-OBJECTIVE_LIBS = libsun.so
+OBJECTIVE_LIBS = libsun$(SHARED_SUFFIX)
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
 LIBADD = $(GTK_LIBS)
 SOURCES= $(sunsources)
 OBJECTS= ${SOURCES:.c=.o}
--- a/Plugins/Visualization/blur_scope/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Visualization/blur_scope/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = libbscope.so
+OBJECTIVE_LIBS = libbscope$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
@@ -11,6 +11,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/Plugins/Visualization/paranormal/Makefile	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Visualization/paranormal/Makefile	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-CFLAGS += -fPIC -DPIC -Ipn/ -I../../.. $(ARCH_DEFINES) $(GTK_CFLAGS) $(SDL_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS)
+CFLAGS += $(PICFLAGS) -Ipn/ -I../../.. $(ARCH_DEFINES) $(GTK_CFLAGS) $(SDL_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS)
 
 SUBDIRS = pn
 
@@ -9,7 +9,7 @@
 
 LIBADD += $(GTK_LIBS) $(SDL_LIBS) $(XML_LIBS) pn/libparanormal.a
 
-OBJECTIVE_LIBS = libparanormal.so
+OBJECTIVE_LIBS = libparanormal$(SHARED_SUFFIX)
 
 SOURCES = client.c
 
--- a/Plugins/Visualization/paranormal/pn/Makefile	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/Makefile	Wed Sep 06 13:21:40 2006 -0700
@@ -6,7 +6,7 @@
 OBJECT_CFLAGS   = $(GTK_CFLAGS)
 OBJECT_LIBS     = $(GTK_LIBS)
 
-CFLAGS += -fPIC -DPIC -Wall -g -I../../../.. $(OBJECT_CFLAGS) $(XML_CPPFLAGS) -I..
+CFLAGS += $(PICFLAGS) -Wall -g -I../../../.. $(OBJECT_CFLAGS) $(XML_CPPFLAGS) -I..
 LIBADD   = -lm $(OBJECT_LIBS) $(XML_LIBS)
 
 SOURCES =  \
--- a/Plugins/Visualization/rocklight/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/Plugins/Visualization/rocklight/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -1,7 +1,7 @@
 include ../../../mk/rules.mk
 include ../../../mk/init.mk
 
-OBJECTIVE_LIBS = librocklight.so
+OBJECTIVE_LIBS = librocklight$(SHARED_SUFFIX)
 
 LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
@@ -11,6 +11,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
 
 include ../../../mk/objective.mk
--- a/libaudacious/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/libaudacious/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -3,7 +3,7 @@
 
 beepincludedir = $(includedir)/audacious
 
-OBJECTIVE_LIBS = libaudacious.so
+OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX)
 OBJECTIVE_SONAME_SUFFIX = 3.0.0
 
 LDFLAGS += -Wl,-export-dynamic
@@ -13,7 +13,7 @@
 	$(GCONF_LIBS)    \
 	$(GNOMEVFS_LIBS)
 
-CFLAGS += -fPIC -DPIC \
+CFLAGS += $(PICFLAGS) \
 	$(GTK_CFLAGS)        \
 	$(GCONF_CFLAGS)      \
 	$(GNOMEVFS_CFLAGS)   \
@@ -46,8 +46,8 @@
 include ../mk/objective.mk
 
 install-posthook:
-	@mv ${DESTDIR}/${LIBDIR}/libaudacious.so ${DESTDIR}/${LIBDIR}/libaudacious.so.3.0.0
-	@ln -sf ${LIBDIR}/libaudacious.so.3.0.0 \
-		${DESTDIR}/${LIBDIR}/libaudacious.so.3
-	@ln -sf ${LIBDIR}/libaudacious.so.3 \
-		${DESTDIR}/${LIBDIR}/libaudacious.so
+	@mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).3.0.0
+	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).3.0.0 \
+		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).3
+	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).3 \
+		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)
--- a/libguess/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/libguess/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -6,7 +6,7 @@
 
 LDFLAGS += -Wl,-export-dynamic
 
-CFLAGS += -fPIC -DPIC
+CFLAGS += $(PICFLAGS)
 
 SOURCES = \
 	guess.c
--- a/librcd/Makefile.in	Wed Sep 06 13:04:37 2006 -0700
+++ b/librcd/Makefile.in	Wed Sep 06 13:21:40 2006 -0700
@@ -6,7 +6,7 @@
 
 LDFLAGS += -Wl,-export-dynamic
 
-CFLAGS += -fPIC -DPIC
+CFLAGS += $(PICFLAGS)
 
 SOURCES = \
 	librcd.c
--- a/mk/objective.mk	Wed Sep 06 13:04:37 2006 -0700
+++ b/mk/objective.mk	Wed Sep 06 13:21:40 2006 -0700
@@ -180,9 +180,9 @@
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \
 		(if [ "x$(OBJECTIVE_SONAME_SUFFIX)" != "x" ]; then \
-			$(CC) -fPIC -DPIC -shared -o $@ -Wl,-soname=$@.$(OBJECTIVE_SONAME_SUFFIX) $(OBJECTS) $(LDFLAGS) $(LIBADD); \
+			$(CC) $(PICLDFLAGS) -o $@ -Wl,-soname=$@.$(OBJECTIVE_SONAME_SUFFIX) $(OBJECTS) $(LDFLAGS) $(LIBADD); \
 		else \
-			$(CC) -fPIC -DPIC -shared -o $@ -Wl,-soname=$@ $(OBJECTS) $(LDFLAGS) $(LIBADD); \
+			$(CC) $(PICLDFLAGS) -o $@ -Wl,-soname=$@ $(OBJECTS) $(LDFLAGS) $(LIBADD); \
 		fi;) \
 	fi