changeset 1615:e402e0217870 trunk

[svn] - fix for the long-standing dependency oddness in our build system. now make tool surely picks up changed source files and builds required objectives.
author yaz
date Mon, 04 Sep 2006 19:47:32 -0700
parents 9b4678a2efc9
children 38107b41e9d3
files ChangeLog Makefile Plugins/Container/Makefile.in Plugins/Container/m3u/Makefile Plugins/Container/pls/Makefile Plugins/Container/xspf/Makefile Plugins/Effect/Makefile.in Plugins/Effect/audiocompress/Makefile.in Plugins/Effect/ladspa/Makefile.in Plugins/Effect/stereo_plugin/Makefile.in Plugins/Effect/voice_removal/Makefile.in Plugins/General/Makefile.in Plugins/General/lirc/Makefile.in Plugins/General/notify/Makefile Plugins/General/scrobbler/Makefile.in Plugins/General/song_change/Makefile.in Plugins/Input/Makefile.in Plugins/Input/aac/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/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/Makefile.in Plugins/Output/Makefile.in Plugins/Output/OSS/Makefile.in Plugins/Output/alsa/Makefile.in Plugins/Output/arts/Makefile.in Plugins/Output/arts/arts_helper/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/Makefile.in Plugins/Visualization/blur_scope/Makefile.in Plugins/Visualization/paranormal/Makefile Plugins/Visualization/paranormal/pn/Makefile Plugins/Visualization/rocklight/Makefile.in audacious/Makefile audacious/glade/Makefile audacious/images/Makefile.in audacious/library/Makefile audacious/widgets/Makefile audtool/Makefile icons/Makefile.in libaudacious/Makefile.in libguess/Makefile.in librcd/Makefile.in mk/init.mk mk/objective.mk skin/Makefile.in sqlite/Makefile
diffstat 77 files changed, 240 insertions(+), 96 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Sep 03 22:04:17 2006 -0700
+++ b/ChangeLog	Mon Sep 04 19:47:32 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-04 05:04:17 +0000  George Averill <nhjm449@gmail.com>
+  revision [2159]
+  - If transparency fails, disable it.
+  
+
+  Changes:        Modified:
+  +9 -3           trunk/audacious/widgets/playlist_list.c  
+
+
 2006-09-02 15:24:10 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2157]
   - chardet patch for Russian language witten by Valentine Sinitsyn.
--- a/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,10 +1,12 @@
 .SILENT:
 
 sinclude mk/rules.mk
-include mk/objective.mk
+include mk/init.mk
 
 SUBDIRS = Plugins libaudacious intl $(SUBDIR_GUESS) sqlite audacious audtool po icons skin
 
+include mk/objective.mk
+
 install-posthook:
 	@if test `whoami` = 'root' && test -z "$(DESTDIR)"; then \
 		echo "[running ldconfig to update system library cache]"; \
@@ -16,3 +18,4 @@
 	audacious.pc:$(LIBDIR)/pkgconfig				\
 	audacious.1:$(mandir)/man1					\
 	audacious/audacious.desktop:$(datadir)/applications
+
--- a/Plugins/Container/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Container/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,7 +1,7 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 ALL_PLUGINS = pls m3u
 SUBDIRS = @CONTAINER_PLUGINS@
 
-
+include ../../mk/objective.mk
--- a/Plugins/Container/m3u/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Container/m3u/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libm3u.so
 
@@ -14,3 +14,5 @@
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS)
+
+include ../../../mk/objective.mk
--- a/Plugins/Container/pls/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Container/pls/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libpls.so
 
@@ -14,3 +14,5 @@
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS)
+
+include ../../../mk/objective.mk
--- a/Plugins/Container/xspf/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Container/xspf/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libxspf.so
 
@@ -14,3 +14,5 @@
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS) $(XML_LIBS)
+
+include ../../../mk/objective.mk
--- a/Plugins/Effect/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Effect/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,4 +1,6 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 SUBDIRS = audiocompress ladspa stereo_plugin voice_removal
+
+include ../../mk/objective.mk
--- a/Plugins/Effect/audiocompress/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Effect/audiocompress/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libaudiocompress.so
 
@@ -13,3 +13,4 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../../../mk/objective.mk
--- a/Plugins/Effect/ladspa/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Effect/ladspa/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libladspa.so
 
@@ -13,3 +13,4 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../../../mk/objective.mk
--- a/Plugins/Effect/stereo_plugin/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Effect/stereo_plugin/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libstereo.so
 
@@ -13,3 +13,4 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../../../mk/objective.mk
--- a/Plugins/Effect/voice_removal/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Effect/voice_removal/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libvoice_removal.so
 
@@ -13,3 +13,4 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../../../mk/objective.mk
--- a/Plugins/General/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/General/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,6 +1,7 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 ALL_PLUGINS = lirc song_change
 SUBDIRS = @GENERAL_PLUGINS@
 
+include ../../mk/objective.mk
--- a/Plugins/General/lirc/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/General/lirc/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = liblirc.so
 
@@ -11,3 +11,5 @@
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
--- a/Plugins/General/notify/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/General/notify/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libnotify.so
 
@@ -14,3 +14,5 @@
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS) $(LIBNOTIFY_LIBS)
+
+include ../../../mk/objective.mk
--- a/Plugins/General/scrobbler/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/General/scrobbler/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 SUBDIRS = 
 
@@ -26,3 +26,5 @@
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
--- a/Plugins/General/song_change/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/General/song_change/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libsong_change.so
 
@@ -12,3 +12,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC $(BEEP_DEFINES) $(GTK_CFLAGS) -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,7 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 ALL_PLUGINS = mpg123 aac modplug vorbis tonegen cdaudio sid wav flac console timidity musepack sexypsf adplug wma amidi-plug cue
 SUBDIRS = @INPUT_PLUGINS@
+
+include ../../mk/objective.mk
--- a/Plugins/Input/aac/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/aac/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,4 +1,6 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 SUBDIRS = mp4ff libfaad2 src
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/aac/libfaad2/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 CFLAGS += -I../include -I../../../.. -I. -fPIC -DPIC
 
@@ -18,5 +18,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../../../../mk/objective.mk
+
 libfaad.a: $(OBJECTS)
 	$(AR) cq $@ $(OBJECTS)
--- a/Plugins/Input/aac/mp4ff/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = libmp4ff.a
 
@@ -9,3 +9,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC -DUSE_TAGGING=1 -fsigned-char -I../../../.. -I../../../../intl
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/aac/src/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/aac/src/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 OBJECTIVE_LIBS = libaac.so
 
@@ -15,3 +15,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../include -I../libfaad -I../mp4ff
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/adplug/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/adplug/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 SUBDIRS = core
 OBJECTIVE_LIBS = libadplug.so
@@ -16,3 +16,5 @@
 	-I../../../intl -I../../.. -I./core
 CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(BINIO_CFLAGS) \
 	-I../../../intl -I../../.. -I./core
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/adplug/core/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/adplug/core/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = libadplugcore.a
 
@@ -22,3 +22,5 @@
 CFLAGS += -fPIC -DPIC $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp
 
 OBJECTS = ${SOURCES:.c=.o} ${SOURCES:.cpp=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/amidi-plug/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/amidi-plug/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libamidi-plug.so
 SUBDIRS = pcfg @AMIDIPLUG_BACKENDS@
@@ -23,3 +23,5 @@
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGDATADIR=\"$(AMIDIPLUGDATADIR)\" \
           -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/amidi-plug/backend-alsa/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-alsa/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 noinst_HEADERS = b-alsa.h b-alsa-config.h backend-alsa-icon.xpm
 
@@ -13,3 +13,5 @@
 SOURCES = b-alsa.c
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/amidi-plug/backend-dummy/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-dummy/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 noinst_HEADERS = b-dummy.h b-dummy-config.h backend-dummy-icon.xpm
 
@@ -13,3 +13,5 @@
 SOURCES = b-dummy.c
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/amidi-plug/backend-fluidsynth/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-fluidsynth/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 noinst_HEADERS = b-fluidsynth.h b-fluidsynth-config.h backend-fluidsynth-icon.xpm
 
@@ -13,3 +13,5 @@
 SOURCES = b-fluidsynth.c
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/amidi-plug/pcfg/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/amidi-plug/pcfg/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 noinst_HEADERS = i_pcfg.h
 
@@ -10,3 +10,5 @@
 SOURCES = i_pcfg.c
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/cdaudio/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/cdaudio/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libcdaudio.so
 
@@ -10,3 +10,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC @GTK_CFLAGS@ -I../../../intl -I../../.. -I../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/console/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/console/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libconsole.so
 
@@ -45,3 +45,5 @@
 
 LIBADD += -lz $(GTK_LIBS) -lstdc++
 CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/cue/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/cue/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libcuesheet.so
 
@@ -14,3 +14,5 @@
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS)
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/flac/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/flac/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 SUBDIRS = plugin_common
 
@@ -35,3 +35,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. $(LIBFLAC_CFLAGS)
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/flac/plugin_common/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 CFLAGS += -fPIC -DPIC -I.. -I../../../..
 
@@ -19,3 +19,5 @@
 	tags.c
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/modplug/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/modplug/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libmodplug.so
 SUBDIRS = archive gui
@@ -11,3 +11,5 @@
 SOURCES  = plugin.cpp modplugbmp.cpp
 
 OBJECTS = ${SOURCES:.cpp=.o}
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/modplug/archive/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/modplug/archive/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 CXXFLAGS += -fPIC -DPIC -I../../..
 
@@ -14,3 +14,5 @@
           arch_bz2.cpp
 
 OBJECTS = ${SOURCES:.cpp=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/modplug/gui/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/modplug/gui/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 CFLAGS   += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
 CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
@@ -8,3 +8,5 @@
 SOURCES = main.cpp support.cpp interface.cpp callbacks.cpp
 
 OBJECTS = ${SOURCES:.cpp=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/mpg123/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/mpg123/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libmpg123.so
 
@@ -17,3 +17,5 @@
 CXXFLAGS += -UPSYCHO -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
 
 LIBADD = -ltag_c $(GTK_LIBS) $(TAGLIB_LIBS)
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/musepack/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/musepack/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libmpc.so
 
@@ -12,3 +12,5 @@
 OBJECTS = ${SOURCES:.cpp=.o}
 
 CXXFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(TAGLIB_CFLAGS) -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/sexypsf/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/sexypsf/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libsexypsf.so
 
@@ -25,5 +25,7 @@
 
 CFLAGS += -Wno-nonnull -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. -Ispu/ -I.
 
+include ../../../mk/objective.mk
+
 clean-posthook:
 	@rm -f spu/*.o
--- a/Plugins/Input/sid/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/sid/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libsid.so
 
@@ -38,3 +38,5 @@
 
 OBJECTS1 = ${SOURCES:.c=.o}
 OBJECTS = ${OBJECTS1:.cc=.o}
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/timidity/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/timidity/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,4 +1,6 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 SUBDIRS = libtimidity src
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/timidity/libtimidity/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/timidity/libtimidity/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = libtimidity.a
 
@@ -20,3 +20,5 @@
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/timidity/src/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/timidity/src/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 OBJECTIVE_LIBS = libtimidity.so
 
@@ -15,3 +15,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../libtimidity
+
+include ../../../../mk/objective.mk
--- a/Plugins/Input/tonegen/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/tonegen/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libtonegen.so
 
@@ -10,3 +10,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC @GTK_CFLAGS@ -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/vorbis/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/vorbis/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libvorbis.so
 
@@ -12,3 +12,5 @@
 LIBADD = $(OGG_VORBIS_LIBS)
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. -I../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/wav/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/wav/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libwav.so
 
@@ -12,3 +12,5 @@
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/wma/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/wma/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libwma.so
 
@@ -14,3 +14,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. -I./libffwma -std=c99
+
+include ../../../mk/objective.mk
--- a/Plugins/Input/wma/libffwma/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Input/wma/libffwma/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST=	libffwma.a
 
@@ -16,3 +16,5 @@
 CFLAGS+=	-fPIC -DPIC $(GTK_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../../.. -I../../../../intl
 
 OBJECTS=${SOURCES:.c=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,4 +1,6 @@
 include ../mk/rules.mk
-include ../mk/objective.mk
+include ../mk/init.mk
 
 SUBDIRS = Input Output Effect Visualization General Container
+
+include ../mk/objective.mk
--- a/Plugins/Output/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,7 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 ALL_PLUGINS = OSS alsa disk_writer esd jack arts
 SUBDIRS = @OUTPUT_PLUGINS@
+
+include ../../mk/objective.mk
--- a/Plugins/Output/OSS/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/OSS/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libOSS.so
 
@@ -13,3 +13,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Output/alsa/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/alsa/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libALSA.so
 
@@ -14,3 +14,5 @@
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ALSA_CFLAGS) \
 	-I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Output/arts/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/arts/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 SUBDIRS = arts_helper
 
@@ -13,3 +13,5 @@
 LIBADD = $(GTK_LIBS) $(ARTSC_LIBS) -lpthread
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
--- a/Plugins/Output/arts/arts_helper/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/arts/arts_helper/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 SOURCES = arts_helper.c
 
@@ -12,5 +12,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../../../../mk/objective.mk
+
 audacious-arts-helper: $(OBJECTS)
 	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
--- a/Plugins/Output/disk_writer/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/disk_writer/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libdisk_writer.so
 
@@ -11,3 +11,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Output/esd/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/esd/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libESD.so
 
@@ -14,3 +14,5 @@
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ESD_CFLAGS) \
 	-I../../../intl -I../../.. -I..
+
+include ../../../mk/objective.mk
--- a/Plugins/Output/jack/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/jack/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 SOURCES = jack.c configure.c bio2jack.c
 
@@ -11,3 +11,5 @@
 LIBADD = $(GTK_LIBS) $(JACK_LIBS) $(SAMPLERATE_LIBS) -lpthread
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
--- a/Plugins/Output/sun/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Output/sun/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 sunsources =	sun.c	    \
 		audio.c	    \
@@ -15,3 +15,5 @@
 LIBADD = $(GTK_LIBS)
 SOURCES= $(sunsources)
 OBJECTS= ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
--- a/Plugins/Visualization/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Visualization/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,7 +1,7 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 ALL_PLUGINS = blur_scope libvisual-proxy
 SUBDIRS = @VISUALIZATION_PLUGINS@
 
-
+include ../../mk/objective.mk
--- a/Plugins/Visualization/blur_scope/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Visualization/blur_scope/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = libbscope.so
 
@@ -12,3 +12,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/Plugins/Visualization/paranormal/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Visualization/paranormal/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 CFLAGS += -fPIC -DPIC -Ipn/ -I../../.. $(ARCH_DEFINES) $(GTK_CFLAGS) $(SDL_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS)
 
@@ -15,3 +15,4 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../../../mk/objective.mk
--- a/Plugins/Visualization/paranormal/pn/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../../mk/rules.mk
-include ../../../../mk/objective.mk
+include ../../../../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = libparanormal.a
 
@@ -42,3 +42,5 @@
 	pnvis.c             
 
 OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../../mk/objective.mk
--- a/Plugins/Visualization/rocklight/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/Plugins/Visualization/rocklight/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../../mk/rules.mk
-include ../../../mk/objective.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS = librocklight.so
 
@@ -12,3 +12,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+
+include ../../../mk/objective.mk
--- a/audacious/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/audacious/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,4 +1,5 @@
 include ../mk/rules.mk
+include ../mk/init.mk
 include ../mk/objective.mk
 
 SUBDIRS = widgets glade images
--- a/audacious/glade/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/audacious/glade/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 gladexmldir = $(pkgdatadir)/glade
 
@@ -8,3 +8,5 @@
 	fileinfo_popup.glade:$(gladexmldir) \
 	prefswin.glade:$(gladexmldir) \
 	addfiles.glade:$(gladexmldir)
+
+include ../../mk/objective.mk
--- a/audacious/images/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/audacious/images/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 imagesdir = $(pkgdatadir)/images
 
@@ -12,3 +12,5 @@
 	playlist.png:$(imagesdir) \
 	plugins.png:$(imagesdir) \
 	eq.png:$(imagesdir)
+
+include ../../mk/objective.mk
--- a/audacious/library/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/audacious/library/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,7 +1,9 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 schemadir = $(pkgdatadir)/schema
 
 OBJECTIVE_DATA = \
 	schema.sqlite:$(schemadir)
+
+include ../../mk/objective.mk
--- a/audacious/widgets/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/audacious/widgets/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../../mk/rules.mk
-include ../../mk/objective.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = libwidgets.a
 
@@ -35,3 +35,4 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../../mk/objective.mk
--- a/audtool/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/audtool/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,4 +1,5 @@
 include ../mk/rules.mk
+include ../mk/init.mk
 include ../mk/objective.mk
 
 beepincludedir = $(includedir)/audacious
--- a/icons/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/icons/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,7 @@
 include ../mk/rules.mk
-include ../mk/objective.mk
+include ../mk/init.mk
 
 pixmapsdir = $(datadir)/pixmaps
 OBJECTIVE_DATA = audacious.png:$(pixmapsdir)
+
+include ../mk/objective.mk
--- a/libaudacious/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/libaudacious/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../mk/rules.mk
-include ../mk/objective.mk
+include ../mk/init.mk
 
 beepincludedir = $(includedir)/audacious
 
@@ -43,6 +43,8 @@
 	beepctrl.h dirbrowser.h util.h \
 	formatter.h titlestring.h xml_document.h
 
+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 \
--- a/libguess/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/libguess/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../mk/rules.mk
-include ../mk/objective.mk
+include ../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = libguess.a
 OBJECTIVE_SONAME_SUFFIX = 0.2.0
@@ -13,5 +13,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../mk/objective.mk
+
 libguess.a: $(OBJECTS)
 	$(AR) cq $@ $(OBJECTS)
--- a/librcd/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/librcd/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../mk/rules.mk
-include ../mk/objective.mk
+include ../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = librcd.a
 OBJECTIVE_SONAME_SUFFIX = 0.1.8
@@ -13,5 +13,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+include ../mk/objective.mk
+
 libguess.a: $(OBJECTS)
 	$(AR) cq $@ $(OBJECTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/init.mk	Mon Sep 04 19:47:32 2006 -0700
@@ -0,0 +1,21 @@
+# Shut up GNU make
+.SILENT:
+
+OBJECTIVE_DIRECTORIES = 
+OBJECTIVE_LIBS = 
+OBJECTIVE_LIBS_NOINST = 
+OBJECTIVE_BINS = 
+OBJECTIVE_DATA = 
+SUBDIRS = 
+HEADERS = 
+V = 0
+VERBOSE ?= $(V)
+VERBOSITY = 0
+SHOW_CFLAGS ?= $(VERBOSE)
+
+LIBDIR = $(libdir)
+BINDIR = $(bindir)
+INCLUDEDIR = $(pkgincludedir)
+CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
+CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
+
--- a/mk/objective.mk	Sun Sep 03 22:04:17 2006 -0700
+++ b/mk/objective.mk	Mon Sep 04 19:47:32 2006 -0700
@@ -1,24 +1,3 @@
-# Shut up GNU make
-.SILENT:
-
-OBJECTIVE_DIRECTORIES = 
-OBJECTIVE_LIBS = 
-OBJECTIVE_LIBS_NOINST = 
-OBJECTIVE_BINS = 
-OBJECTIVE_DATA = 
-SUBDIRS = 
-HEADERS = 
-V = 0
-VERBOSE ?= $(V)
-VERBOSITY = 0
-SHOW_CFLAGS ?= $(VERBOSE)
-
-LIBDIR = $(libdir)
-BINDIR = $(bindir)
-INCLUDEDIR = $(pkgincludedir)
-CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
-CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
-
 default: all
 all: build
 
@@ -196,7 +175,7 @@
 	fi;
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-%.so $(OBJECTIVE_LIBS): $(OBJECTS)
+$(OBJECTIVE_LIBS): $(OBJECTS)
 	if [ "x$(OBJECTS)" != "x" ]; then \
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \
--- a/skin/Makefile.in	Sun Sep 03 22:04:17 2006 -0700
+++ b/skin/Makefile.in	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../mk/rules.mk
-include ../mk/objective.mk
+include ../mk/init.mk
 
 skindir = $(pkgdatadir)/Skins/Default
 OBJECTIVE_DATA = \
@@ -20,3 +20,5 @@
 	pledit.txt:$(skindir)		\
 	viscolor.txt:$(skindir)		\
 	skin.hints:$(skindir)
+
+include ../mk/objective.mk
--- a/sqlite/Makefile	Sun Sep 03 22:04:17 2006 -0700
+++ b/sqlite/Makefile	Mon Sep 04 19:47:32 2006 -0700
@@ -1,5 +1,5 @@
 include ../mk/rules.mk
-include ../mk/objective.mk
+include ../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = libsqlite.a
 
@@ -17,3 +17,4 @@
 
 OBJECTS=${SOURCES:.c=.o}
 
+include ../mk/objective.mk