Mercurial > audlegacy-plugins
changeset 388:ad8e44bcdf8a trunk
[svn] reverted to 844, to be re-reconsidered later
line wrap: on
line diff
--- a/ChangeLog Sun Dec 17 07:06:34 2006 -0800 +++ b/ChangeLog Sun Dec 17 08:46:44 2006 -0800 @@ -1,3 +1,60 @@ +2006-12-17 15:06:34 +0000 Giacomo Lozito <james@develia.org> + revision [846] + - added AUDACIOUS_LIBS and AUDACIOUS_CFLAGS to makefiles to ensure that plugins are linked to libaudacious + trunk/mk/rules.mk.in | 2 ++ + trunk/src/CoreAudio/Makefile | 4 ++-- + trunk/src/OSS/Makefile | 4 ++-- + trunk/src/aac/src/Makefile | 4 ++-- + trunk/src/adplug/Makefile | 6 +++--- + trunk/src/alac/Makefile | 3 ++- + trunk/src/alarm/Makefile | 4 ++-- + trunk/src/alsa/Makefile | 4 ++-- + trunk/src/amidi-plug/Makefile | 4 ++-- + trunk/src/arts/Makefile | 4 ++-- + trunk/src/audiocompress/Makefile | 4 ++-- + trunk/src/blur_scope/Makefile | 4 ++-- + trunk/src/cdaudio/Makefile | 3 ++- + trunk/src/console/Makefile | 4 ++-- + trunk/src/cue/Makefile | 4 ++-- + trunk/src/disk_writer/Makefile | 4 ++-- + trunk/src/echo_plugin/Makefile | 4 ++-- + trunk/src/esd/Makefile | 4 ++-- + trunk/src/flac112/Makefile | 4 ++-- + trunk/src/flac113/Makefile | 4 ++-- + trunk/src/jack/Makefile | 4 ++-- + trunk/src/ladspa/Makefile | 4 ++-- + trunk/src/lirc/Makefile | 4 ++-- + trunk/src/m3u/Makefile | 4 ++-- + trunk/src/metronom/Makefile | 3 ++- + trunk/src/modplug/Makefile | 4 ++-- + trunk/src/mpg123/Makefile | 6 +++--- + trunk/src/musepack/Makefile | 4 ++-- + trunk/src/null/Makefile | 3 ++- + trunk/src/paranormal/Makefile | 4 ++-- + trunk/src/pls/Makefile | 4 ++-- + trunk/src/projectm/Makefile | 4 ++-- + trunk/src/pulse_audio/Makefile | 4 ++-- + trunk/src/rocklight/Makefile | 4 ++-- + trunk/src/scrobbler/Makefile | 4 ++-- + trunk/src/sexypsf/Makefile | 4 ++-- + trunk/src/sid/Makefile | 6 +++--- + trunk/src/song_change/Makefile | 4 ++-- + trunk/src/spectrum/Makefile | 4 ++-- + trunk/src/stdio/Makefile | 4 ++-- + trunk/src/stereo_plugin/Makefile | 4 ++-- + trunk/src/sun/Makefile | 4 ++-- + trunk/src/timidity/src/Makefile | 4 ++-- + trunk/src/tonegen/Makefile | 3 ++- + trunk/src/tta/Makefile | 6 +++--- + trunk/src/voice_removal/Makefile | 4 ++-- + trunk/src/vorbis/Makefile | 4 ++-- + trunk/src/wav/Makefile | 4 ++-- + trunk/src/wavpack/Makefile | 4 ++-- + trunk/src/wma/Makefile | 4 ++-- + trunk/src/xspf/Makefile | 4 ++-- + 51 files changed, 106 insertions(+), 99 deletions(-) + + 2006-12-16 10:56:32 +0000 Giacomo Lozito <james@develia.org> revision [844] - updated m3u.c, xspf.c, pls.c to use the playlist->mutex and no more playlist_get
--- a/mk/rules.mk.in Sun Dec 17 07:06:34 2006 -0800 +++ b/mk/rules.mk.in Sun Dec 17 08:46:44 2006 -0800 @@ -71,8 +71,6 @@ ARCH_X86_TRUE ?= @ARCH_X86_TRUE@ ARTSC_CFLAGS ?= @ARTSC_CFLAGS@ ARTSC_LIBS ?= @ARTSC_LIBS@ -AUDACIOUS_CFLAGS ?= @AUDACIOUS_CFLAGS@ -AUDACIOUS_LIBS ?= @AUDACIOUS_LIBS@ AUTOCONF ?= @AUTOCONF@ AUTOHEADER ?= @AUTOHEADER@ AUTOMAKE ?= @AUTOMAKE@
--- a/src/CoreAudio/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/CoreAudio/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,11 +7,11 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) -Wl,-framework,CoreAudio +LIBADD = $(GTK_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) $(AUDACIOUS_CFLAGS) -I../..intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../..intl -I../.. include ../../mk/objective.mk
--- a/src/OSS/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/OSS/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,11 +7,11 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) -LIBADD = $(OSS_LIBS) $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(OSS_LIBS) $(GTK_LIBS) SOURCES = OSS.c mixer.c about.c configure.c audio.c init.c convert.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/aac/src/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/aac/src/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -8,12 +8,12 @@ # override objective make's LIBDIR LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LDFLAGS += ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a -lstdc++ $(AUDACIOUS_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) $(AUDACIOUS_CFLAGS) -I../../.. -I../include -I../libfaad -I../mp4ff +CFLAGS += $(GTK_CFLAGS) -I../../.. -I../include -I../libfaad -I../mp4ff include ../../../mk/objective.mk
--- a/src/adplug/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/adplug/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -6,15 +6,15 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = ./core/libadplugcore.a $(BINIO_LIBS) $(AUDACIOUS_LIBS) -lstdc++ +LIBADD = ./core/libadplugcore.a $(BINIO_LIBS) -lstdc++ SOURCES = adplug-xmms.cc OBJECTS = ${SOURCES:.cc=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) $(AUDACIOUS_CFLAGS) \ +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \ -I../../intl -I../.. -I./core -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) $(AUDACIOUS_CFLAGS) \ +CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \ -I../../intl -I../.. -I./core include ../../mk/objective.mk
--- a/src/alac/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/alac/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -4,12 +4,11 @@ OBJECTIVE_LIBS = libalac$(SHARED_SUFFIX) LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(AUDACIOUS_LIBS) SOURCES = alac.c demux.c plugin.c stream.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../.. include ../../mk/objective.mk
--- a/src/alarm/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/alarm/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,11 +7,11 @@ LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR) -LIBADD += $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD += $(GTK_LIBS) SOURCES = alarm.c interface.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(BEEP_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/alsa/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/alsa/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,12 +7,12 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(ALSA_LIBS) $(AUDACIOUS_LIBS) -lpthread +LIBADD = $(GTK_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) $(AUDACIOUS_CFLAGS) \ +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ALSA_CFLAGS) \ -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/amidi-plug/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/amidi-plug/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -14,7 +14,7 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(GMODULE_LIBS) $(AUDACIOUS_LIBS) -lpthread ./pcfg/libpcfg.a +LIBADD = $(GTK_LIBS) $(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) $(AUDACIOUS_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \ +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \ -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/arts/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/arts/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -9,8 +9,8 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(ARTSC_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. -LIBADD = $(GTK_LIBS) $(ARTSC_LIBS) $(AUDACIOUS_LIBS) -lpthread +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(ARTSC_CFLAGS) -I../../intl -I../.. +LIBADD = $(GTK_LIBS) $(ARTSC_LIBS) -lpthread OBJECTS = ${SOURCES:.c=.o}
--- a/src/audiocompress/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/audiocompress/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,11 +5,11 @@ LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = compress.c audacious-glue.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/blur_scope/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/blur_scope/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,12 +5,12 @@ LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = blur_scope.c config.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/cdaudio/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/cdaudio/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -4,12 +4,11 @@ OBJECTIVE_LIBS = libcdaudio$(SHARED_SUFFIX) LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(AUDACIOUS_LIBS) SOURCES = cdaudio.c cddb.c cdinfo.c configure.c http.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../.. include ../../mk/objective.mk
--- a/src/console/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/console/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -59,7 +59,7 @@ OBJECTS = ${SOURCES:.cxx=.o} -LIBADD += -lz $(GTK_LIBS) $(AUDACIOUS_LIBS) -lstdc++ -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +LIBADD += -lz $(GTK_LIBS) -lstdc++ +CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/cue/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/cue/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -9,10 +9,10 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. CXXFLAGS = $(CFLAGS) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) include ../../mk/objective.mk
--- a/src/disk_writer/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/disk_writer/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,11 +5,11 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = disk_writer.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/echo_plugin/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/echo_plugin/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,11 +5,11 @@ LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = echo.c gui.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/esd/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/esd/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,12 +7,12 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(ESD_LIBS) $(OSS_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_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) $(AUDACIOUS_CFLAGS) \ +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ESD_CFLAGS) \ -I../../intl -I../.. -I.. include ../../mk/objective.mk
--- a/src/flac112/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/flac112/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -18,7 +18,7 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(LIBFLAC_LIBS) $(AUDACIOUS_LIBS) -L./plugin_common -lplugin_common +LIBADD = $(LIBFLAC_LIBS) -L./plugin_common -lplugin_common SOURCES = \ charset.c \ @@ -34,6 +34,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS) +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS) include ../../mk/objective.mk
--- a/src/flac113/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/flac113/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -18,7 +18,7 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(LIBFLAC_LIBS) $(AUDACIOUS_LIBS) -L./plugin_common -lplugin_common +LIBADD = $(LIBFLAC_LIBS) -L./plugin_common -lplugin_common SOURCES = \ charset.c \ @@ -34,6 +34,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS) +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS) include ../../mk/objective.mk
--- a/src/jack/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/jack/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,8 +7,8 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(SAMPLERATE_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. -LIBADD = $(GTK_LIBS) $(JACK_LIBS) $(SAMPLERATE_LIBS) $(AUDACIOUS_LIBS) -lpthread +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(SAMPLERATE_CFLAGS) -I../../intl -I../.. +LIBADD = $(GTK_LIBS) $(JACK_LIBS) $(SAMPLERATE_LIBS) -lpthread OBJECTS = ${SOURCES:.c=.o}
--- a/src/ladspa/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/ladspa/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,11 +5,11 @@ LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = ladspa.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/lirc/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/lirc/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,10 +5,10 @@ LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR) -LIBADD = -llirc_client $(AUDACIOUS_LIBS) +LIBADD = -llirc_client SOURCES = about.c lirc.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/m3u/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/m3u/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -9,10 +9,10 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. CXXFLAGS = $(CFLAGS) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) include ../../mk/objective.mk
--- a/src/metronom/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/metronom/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -4,12 +4,11 @@ OBJECTIVE_LIBS = libmetronom$(SHARED_SUFFIX) LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(AUDACIOUS_LIBS) SOURCES = metronom.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/modplug/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/modplug/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -6,8 +6,8 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I.. -I../.. -I../../intl -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) -lstdc++ ./archive/libarchive.a ./gui/libgui.a +CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I.. -I../.. -I../../intl +LIBADD = $(GTK_LIBS) -lstdc++ ./archive/libarchive.a ./gui/libgui.a SOURCES.plugin = plugin.cxx modplugbmp.cxx SOURCES.core = tables.cxx \ sndmix.cxx \
--- a/src/mpg123/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/mpg123/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -13,9 +13,9 @@ OBJECTS = ${SOURCES:.c=.o} tag_c_hacked.o -CFLAGS += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) $(LIBNMS_CFLAGS) -I../../intl -I../.. -CXXFLAGS += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +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../.. -LIBADD = -ltag_c $(GTK_LIBS) $(AUDACIOUS_LIBS) $(TAGLIB_LIBS) $(LIBNMS_LIBS) +LIBADD = -ltag_c $(GTK_LIBS) $(TAGLIB_LIBS) $(LIBNMS_LIBS) include ../../mk/objective.mk
--- a/src/musepack/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/musepack/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,10 +7,10 @@ SOURCES = libmpc.cxx -LIBADD = -lmpcdec $(TAGLIB_LIBS) $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = -lmpcdec $(TAGLIB_LIBS) $(GTK_LIBS) OBJECTS = ${SOURCES:.cxx=.o} -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(TAGLIB_CFLAGS) -I../../intl -I../.. +CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/null/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/null/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -4,13 +4,12 @@ OBJECTIVE_LIBS = libnull${SHARED_SUFFIX} LIBDIR = ${plugindir}/${OUTPUT_PLUGIN_DIR} -LIBADD = $(AUDACIOUS_LIBS) SOURCES = null.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += ${PICFLAGS} $(AUDACIOUS_CFLAGS) \ +CFLAGS += ${PICFLAGS} \ -I../.. include ../../mk/objective.mk
--- a/src/paranormal/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/paranormal/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,7 +7,7 @@ LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(XML_LIBS) $(SDL_LIBS) $(AUDACIOUS_LIBS) libcalc/libcalc.a +LIBADD = $(GTK_LIBS) $(XML_LIBS) $(SDL_LIBS) libcalc/libcalc.a SOURCES = \ actuators.c \ @@ -28,6 +28,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/pls/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/pls/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -9,10 +9,10 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. CXXFLAGS = $(CFLAGS) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) include ../../mk/objective.mk
--- a/src/projectm/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/projectm/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,12 +5,12 @@ LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(SDL_LIBS) $(AUDACIOUS_LIBS) $(LIBPROJECTM_LIBS) -lprojectM +LIBADD = $(GTK_LIBS) $(SDL_LIBS) $(LIBPROJECTM_LIBS) -lprojectM SOURCES = main.c video_init.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) $(LIBPROJECTM_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) $(LIBPROJECTM_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/pulse_audio/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/pulse_audio/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,11 +5,11 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) -lpulse +LIBADD = $(GTK_LIBS) -lpulse SOURCES = pulse_audio.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/rocklight/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/rocklight/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,12 +5,12 @@ LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = rocklight.c $(LEDCODE) OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/scrobbler/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/scrobbler/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -12,7 +12,7 @@ LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR) -LIBADD += $(GTK_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS) $(AUDACIOUS_LIBS) +LIBADD += $(GTK_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS) SOURCES = \ fmt.c \ @@ -24,7 +24,7 @@ hatena.c \ plugin.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) $(AUDACIOUS_CFLAGS) $(CURL_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/sexypsf/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/sexypsf/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -19,11 +19,11 @@ spu/spu.c \ xmms.c -LIBADD = -lz $(AUDACIOUS_LIBS) +LIBADD = -lz OBJECTS = ${SOURCES:.c=.o} -CFLAGS += -Wno-nonnull $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. -Ispu/ -I. +CFLAGS += -Wno-nonnull $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -Ispu/ -I. include ../../mk/objective.mk
--- a/src/sid/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/sid/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -9,15 +9,15 @@ EXTRA_DIST = xmms-sid-logo.xpm # Generals -CFLAGS += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(AUDACIOUS_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../intl -I../.. -CXXFLAGS += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(AUDACIOUS_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 LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) LDFLAGS += $(BUILDERS_LDFLAGS) -LIBADD = $(SIDPLAY1_LDADD) $(SIDPLAY2_LDADD) $(AUDACIOUS_LIBS) $(RESID_LDADD) $(HARDSID_LDADD) $(GTK_LIBS) -lstdc++ +LIBADD = $(SIDPLAY1_LDADD) $(SIDPLAY2_LDADD) $(RESID_LDADD) $(HARDSID_LDADD) $(GTK_LIBS) -lstdc++ SOURCES = \ xs_init.c \ xs_about.c \
--- a/src/song_change/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/song_change/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,12 +5,12 @@ LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = song_change.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(BEEP_DEFINES) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(BEEP_DEFINES) $(GTK_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/spectrum/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/spectrum/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,12 +5,12 @@ LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = spectrum.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/stdio/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/stdio/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -10,10 +10,10 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. CXXFLAGS = $(CFLAGS) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) include ../../mk/objective.mk
--- a/src/stereo_plugin/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/stereo_plugin/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,11 +5,11 @@ LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = stereo.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/sun/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/sun/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -11,8 +11,8 @@ LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) OBJECTIVE_LIBS = libsun$(SHARED_SUFFIX) -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. +LIBADD = $(GTK_LIBS) SOURCES= $(sunsources) OBJECTS= ${SOURCES:.c=.o}
--- a/src/timidity/src/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/timidity/src/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,7 +5,7 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = ../libtimidity/libtimidity.a $(AUDACIOUS_LIBS) +LIBADD = ../libtimidity/libtimidity.a SOURCES = \ callbacks.c \ @@ -14,6 +14,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../.. -I../libtimidity +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../.. -I../libtimidity include ../../../mk/objective.mk
--- a/src/tonegen/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/tonegen/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -4,12 +4,11 @@ OBJECTIVE_LIBS = libtonegen$(SHARED_SUFFIX) LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(AUDACIOUS_LIBS) SOURCES = tonegen.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk
--- a/src/tta/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/tta/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -9,8 +9,8 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../intl -I../.. -LIBADD = -lid3tag $(AUDACIOUS_LIBS) +LIBADD = -lid3tag -include ../../mk/objective.mk +include ../../mk/objective.mk \ No newline at end of file
--- a/src/voice_removal/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/voice_removal/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -5,11 +5,11 @@ LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) SOURCES = voice_removal.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/vorbis/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/vorbis/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -9,8 +9,8 @@ OBJECTS = ${SOURCES:.c=.o} -LIBADD = $(OGG_VORBIS_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(OGG_VORBIS_LIBS) -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../.. include ../../mk/objective.mk
--- a/src/wav/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/wav/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,9 +7,9 @@ SOURCES = wav$(WAV_SNDFILE).c -LIBADD = -L/usr/local/lib $(SNDFILE_LIBS) $(AUDACIOUS_LIBS) +LIBADD = -L/usr/local/lib $(SNDFILE_LIBS) -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. OBJECTS = ${SOURCES:.c=.o}
--- a/src/wavpack/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/wavpack/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,9 +7,9 @@ SOURCES = tags.cxx ui.cxx libwavpack.cxx -LIBADD = -L/usr/local/lib $(WAVPACK_LIBS) $(AUDACIOUS_LIBS) +LIBADD = -L/usr/local/lib $(WAVPACK_LIBS) -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(WAVPACK_CFLAGS) -I../../intl -I../.. +CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(WAVPACK_CFLAGS) -I../../intl -I../.. LDFLAGS += -lstdc++
--- a/src/wma/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/wma/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -7,12 +7,12 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = ./libffwma/libffwma.a $(AUDACIOUS_LIBS) +LIBADD = ./libffwma/libffwma.a SOURCES = wma.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) -I../.. -I./libffwma -std=c99 +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../.. -I./libffwma -std=c99 include ../../mk/objective.mk
--- a/src/xspf/Makefile Sun Dec 17 07:06:34 2006 -0800 +++ b/src/xspf/Makefile Sun Dec 17 08:46:44 2006 -0800 @@ -9,10 +9,10 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(AUDACIOUS_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) -I../../intl -I../.. CXXFLAGS = $(CFLAGS) -LIBADD = $(GTK_LIBS) $(XML_LIBS) $(AUDACIOUS_LIBS) +LIBADD = $(GTK_LIBS) $(XML_LIBS) include ../../mk/objective.mk