Mercurial > audlegacy

changeset 3535:9ddf21ab5c84 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Transit to Mk2.
author William Pitcock <nenolod@atheme.org>
date Mon, 17 Sep 2007 13:10:19 -0500
parents 10990786a090
children 66c6a8a79034
files Makefile buildsys.mk.in configure.ac extra.mk.in icons/Makefile m4/sharedlib.m4 man/Makefile mk/init.mk mk/objective.mk mk/rules.mk.in skins/Classic/Makefile skins/Default/Makefile skins/Ivory/Makefile skins/Makefile skins/Osmosis/Makefile skins/TinyPlayer/Makefile src/Makefile src/audacious/Makefile src/audacious/glade/Makefile src/audacious/images/Makefile src/audacious/intl/Makefile src/audacious/ui/Makefile src/audtool/Makefile src/libaudclient/Makefile src/libguess/Makefile src/libid3tag/Makefile
diffstat 26 files changed, 1186 insertions(+), 1050 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,71 +1,32 @@
-.SILENT:
+DISTCLEAN = extra.mk
 
-include mk/rules.mk
-include mk/init.mk
+include buildsys.mk
 
 SUBDIRS = src man po icons skins
 
-include mk/objective.mk
-
-install-posthook:
-	@if test `whoami` = 'root' && test -z "$(DESTDIR)"; then \
-		echo; \
-		echo "WARNING:"; \
-		echo "On some systems, it might be required that you run"; \
-		echo "ldconfig. However, this isn't done automatically"; \
-		echo "because some ldconfig versions might break the system"; \
-		echo "if it's called without any parameters."; \
-	fi
-
 OBJECTIVE_DATA =							\
 	audacious.pc:$(LIBDIR)/pkgconfig				\
 	audclient.pc:$(LIBDIR)/pkgconfig
 
-build-posthook:
-	@( \
-		echo; \
-		echo "Now type '$(MAKE) documentation-build' to build the audacious SDK docs."; \
-		echo "This will require GTK-DOC to be installed."; \
-		echo; \
-	);
-
-documentation-build:
-	( \
-		if [ ! -d doc ]; then \
-			mkdir -p doc/libaudacious/xml; \
-			mkdir -p doc/audacious/xml; \
+install-extra:
+	y="audacious.pc audclient.pc"; \
+	for i in $$y; do \
+	        ${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${libdir}/pkgconfig && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/pkgconfig/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
 		fi; \
-		cd doc/libaudacious; \
-			gtkdoc-scan --module=libaudacious --source-dir=../../src/libaudacious; \
-		cd ../..; \
-		cd doc/audacious; \
-			gtkdoc-scan --module=audacious --source-dir=../../src/audacious --ignore-headers=intl; \
-		cd ../..; \
-		cd doc/libaudacious; \
-			gtkdoc-mktmpl --module=libaudacious; \
-		cd ../..; \
-		cd doc/audacious; \
-			gtkdoc-mktmpl --module=audacious; \
-		cd ../..; \
-		cd doc/libaudacious; \
-			gtkdoc-mkdb --module=libaudacious --source-dir=../../src/libaudacious/ --output-format=xml --main-sgml-file=xml/libaudacious-main.sgml; \
-		cd ../..; \
-		cd doc/audacious; \
-			gtkdoc-mkdb --module=audacious --source-dir=../../src/audacious/ --ignore-files=intl --output-format=xml --main-sgml-file=xml/audacious-main.sgml; \
-		cd ../..; \
-		rm -rf doc/libaudacious/html; \
-		mkdir -p doc/libaudacious/html; \
-		rm -rf doc/audacious/html; \
-		mkdir -p doc/audacious/html; \
-		cd doc/libaudacious/html; \
-			gtkdoc-mkhtml libaudacious ../libaudacious-main.sgml; \
-		cd ../../..; \
-		cd doc/audacious/html; \
-			rm ../xml/xml; \
-			ln -sf ../xml ../xml/xml; \
-			gtkdoc-mkhtml audacious ../xml/audacious-main.sgml; \
-		cd ../../..; \
-		echo; \
-		echo "The audacious SDK documentation was built successfully in doc/."; \
-		echo; \
-	);
+	done
+
+uninstall-extra:
+	y="audacious.pc audclient.pc"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${libdir}/pkgconfig/$$i ]; then \
+			if rm -f ${DESTDIR}${libdir}/pkgconfig/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/buildsys.mk.in	Mon Sep 17 13:10:19 2007 -0500
@@ -0,0 +1,383 @@
+#
+#  Copyright (c) 2007, Jonathan Schleifer <js@h3c.de>
+#
+#  Permission to use, copy, modify, and/or distribute this software for any
+#  purpose with or without fee is hereby granted, provided that the above
+#  copyright notice and this permission notice is present in all copies.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+
+PACKAGE = @PACKAGE@
+CC = @CC@
+CXX = @CXX@
+CPP = @CPP@
+DC = @DC@
+ERLC = @ERLC@
+OBJC = @OBJC@
+AR = @AR@
+LD = ${CC}
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+DFLAGS = @DFLAGS@
+ERLCFLAGS = @ERLCFLAGS@
+OBJCFLAGS = @OBJCFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+LIB_CPPFLAGS = @LIB_CPPFLAGS@
+LIB_CFLAGS = @LIB_CFLAGS@
+LIB_LDFLAGS = @LIB_LDFLAGS@
+LIB_PREFIX = @LIB_PREFIX@
+LIB_SUFFIX = @LIB_SUFFIX@
+PLUGIN_CPPFLAGS = @PLUGIN_CPPFLAGS@
+PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
+PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
+PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
+INSTALL_LIB = @INSTALL_LIB@
+UNINSTALL_LIB = @UNINSTALL_LIB@
+LN_S = @LN_S@
+MKDIR_P = mkdir -p
+INSTALL = @INSTALL@
+SHELL = @SHELL@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+plugindir ?= ${PACKAGE}
+datarootdir = @datarootdir@
+datadir = @datadir@
+includedir = @includedir@
+includesubdir ?= ${PACKAGE}
+mandir = @mandir@
+mansubdir ?= man1
+
+OBJS1 = ${SRCS:.c=.o}
+OBJS2 = ${OBJS1:.cc=.o}
+OBJS3 = ${OBJS2:.cxx=.o}
+OBJS4 = ${OBJS3:.d=.o}
+OBJS5 = ${OBJS4:.erl=.beam}
+OBJS += ${OBJS5:.m=.o}
+
+.SILENT:
+.SUFFIXES: .beam .c .cc .cxx .d .erl .m
+.PHONY: all subdirs depend install uninstall clean distclean
+
+all: subdirs depend ${OBJS} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST}
+
+subdirs:
+	for i in ${SUBDIRS}; do \
+		${DIR_ENTER}; \
+		${MAKE} || exit 1; \
+		${DIR_LEAVE}; \
+	done
+
+depend-hook:
+
+depend: depend-hook
+	regen=0; \
+	for i in ${SRCS}; do [ $$i -nt .deps ] && regen=1; done; \
+	if [ $$regen = 1 ]; then \
+		rm -f .deps; \
+		for i in ${SRCS}; do \
+			case $${i##*.} in \
+			c|cc|cxx|m) \
+				${CPP} ${CPPFLAGS} -M $$i >>.deps; \
+			esac; \
+		done; \
+	fi
+
+${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS}
+	${LINK_STATUS}
+	if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \
+		${LINK_OK}; \
+	else \
+		${LINK_FAILED}; \
+	fi
+
+${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${OBJS}
+	${LINK_STATUS}
+	if ${LD} -o $@ ${OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
+		${LINK_OK}; \
+	else \
+		${LINK_FAILED}; \
+	fi
+
+${PLUGIN} ${PLUGIN_NONST}: ${EXT_DEPS} ${OBJS}
+	${LINK_STATUS}
+	if ${LD} -o $@ ${OBJS} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
+		${LINK_OK}; \
+	else \
+		${LINK_FAILED}; \
+	fi
+
+${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS}
+	${LINK_STATUS}
+	if ${AR} cq $@ ${OBJS}; then \
+		${LINK_OK}; \
+	else \
+		${LINK_FAILED}; \
+	fi
+
+${EXT_DEPS}: subdirs
+
+.c.o:
+	${COMPILE_STATUS}
+	if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+		${COMPILE_OK}; \
+	else \
+		${COMPILE_FAILED}; \
+	fi
+
+.cc.o .cxx.o:
+	${COMPILE_STATUS}
+	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+		${COMPILE_OK}; \
+	else \
+		${COMPILE_FAILED}; \
+	fi
+
+.d.o:
+	${COMPILE_STATUS}
+	if test x"$(basename ${DC})" = x"dmd"; then \
+		if ${DC} ${DFLAGS} -c -of$@ $<; then \
+			${COMPILE_OK}; \
+		else \
+			${COMPILE_FAILED}; \
+		fi \
+	else \
+		if ${DC} ${DFLAGS} -c -o $@ $<; then \
+			${COMPILE_OK}; \
+		else \
+			${COMPILE_FAILED}; \
+		fi \
+	fi
+
+.erl.beam:
+	${COMPILE_STATUS}
+	if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
+		${COMPILE_OK}; \
+	else \
+		${COMPILE_FAILED}; \
+	fi
+
+.m.o:
+	${COMPILE_STATUS}
+	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+		${COMPILE_OK}; \
+	else \
+		${COMPILE_FAILED}; \
+	fi
+
+install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra
+	for i in ${SUBDIRS}; do \
+		${DIR_ENTER}; \
+		${MAKE} install || exit 1; \
+		${DIR_LEAVE}; \
+	done
+
+	for i in ${LIB}; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+	for i in ${STATIC_LIB}; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+	for i in ${PLUGIN}; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${libdir}/${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/${plugindir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+	for i in ${DATA}; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${datadir} && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+	for i in ${PROG}; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 -s $$i ${DESTDIR}${bindir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+	for i in ${INCLUDES}; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+	for i in ${MAN}; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${mandir}/${mansubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+install-extra:
+
+uninstall: uninstall-extra
+	for i in ${SUBDIRS}; do \
+		${DIR_ENTER}; \
+		${MAKE} uninstall || exit 1; \
+		${DIR_LEAVE}; \
+	done
+
+	for i in ${LIB}; do \
+		if [ -f ${DESTDIR}${libdir}/$$i ]; then \
+			if ${UNINSTALL_LIB}; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done
+
+	for i in ${STATIC_LIB}; do \
+		if [ -f ${DESTDIR}${libdir}/$$i ]; then \
+			if rm -f ${DESTDIR}${libdir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+
+	for i in ${PLUGIN}; do \
+		if [ -f ${DESTDIR}${libdir}/${plugindir}/$$i ]; then \
+			if rm -f ${DESTDIR}${libdir}/${plugindir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+	-rmdir ${DESTDIR}${libdir}/${plugindir} >/dev/null 2>&1
+
+	for i in ${DATA}; do \
+		if [ -f ${DESTDIR}${datadir}/${PACKAGE}/$$i ]; then \
+			if rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+
+	for i in ${PROG}; do \
+		if [ -f ${DESTDIR}${bindir}/$$i ]; then \
+			if rm -f ${DESTDIR}${bindir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+
+	for i in ${INCLUDES}; do \
+		if [ -f ${DESTDIR}${includedir}/${includesubdir}/$$i ]; then \
+			if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+	-rmdir ${DESTDIR}${includedir}/${includesubdir} >/dev/null 2>&1
+
+	for i in ${MAN}; do \
+		if [ -f ${DESTDIR}${mandir}/${mansubdir}/$$i ]; then \
+			if rm -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+
+uninstall-extra:
+
+clean:
+	for i in ${SUBDIRS}; do \
+		${DIR_ENTER}; \
+		${MAKE} clean || exit 1; \
+		${DIR_LEAVE}; \
+	done
+	
+	for i in ${OBJS} ${CLEAN} .deps *~; do \
+		if [ -f $$i -o -d $$i ]; then \
+			if rm -fr $$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+
+distclean: clean
+	for i in ${SUBDIRS}; do \
+		${DIR_ENTER}; \
+		${MAKE} distclean || exit 1; \
+		${DIR_LEAVE}; \
+	done
+	
+	for i in ${PROG} ${PROG_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST}  ${PLUGIN} ${PLUGIN_NOINST} ${DISTCLEAN}; do \
+		if [ -f $$i -o -d $$i ]; then \
+			if rm -fr $$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+
+DIR_ENTER = printf "\033[0;36mEntering directory \033[1;36m$$i\033[0;36m.\033[0m\n"; cd $$i || exit 1
+DIR_LEAVE = printf "\033[0;36mLeaving directory \033[1;36m$$i\033[0;36m.\033[0m\n"; cd .. || exit 1
+LINK_STATUS = printf "\033[0;33mLinking \033[1;33m$@\033[0;33m...\033[0m\r"
+LINK_OK = printf "\033[0;32mSuccessfully linked \033[1;32m$@\033[0;32m.\033[0m\n"
+LINK_FAILED = printf "\033[0;31mFailed to link \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
+COMPILE_STATUS = printf "\033[0;33mCompiling \033[1;33m$<\033[0;33m...\033[0m\r"
+COMPILE_OK = printf "\033[0;32mSuccessfully compiled \033[1;32m$<\033[0;32m.\033[0m\n"
+COMPILE_FAILED = printf "\033[0;31mFailed to compile \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
+INSTALL_STATUS = printf "\033[0;33mInstalling \033[1;33m$$i\033[0;33m...\033[0m\r"
+INSTALL_OK = printf "\033[0;32mSuccessfully installed \033[1;32m$$i\033[0;32m.\033[0m\n"
+INSTALL_FAILED = printf "\033[0;31mFailed to install \033[1;31m$$i\033[0;31m!\033[0m\n"; exit 1
+DELETE_OK = printf "\033[0;34mDeleted \033[1;34m$$i\033[0;34m.\033[0m\n"
+DELETE_FAILED = printf "\033[0;31mFailed to delete \033[1;31m$$i\033[0;31m!\033[0m\n"; exit 1
+
+-include .deps
--- a/configure.ac	Sat Sep 15 11:07:24 2007 +0200
+++ b/configure.ac	Mon Sep 17 13:10:19 2007 -0500
@@ -158,36 +158,25 @@
 			enable_rpath=$enableval, enable_rpath=yes)
 
 if test "x$enable_rpath" = xyes; then
-    RPATH_VAL="-Wl,-rpath=\${libdir}"
+    case "$target" in
+    *-apple-*)
+        ;;
+    *)
+        RPATH_VAL="-Wl,-rpath=\${libdir}"
+        ;;
+    esac
 fi
 
+AC_SUBST(RPATH_VAL)
+
 dnl plugin stuff
 dnl ========================
 
 dnl Ok, first we find out what flags we need to use.
-AC_MSG_CHECKING([for what extension and flags to use for plugin compilation])
-case "$target" in
-	*-apple-*)
-		AC_MSG_RESULT([Mac OS X: -fPIC -bundle -fno-common -flat_namespace -undefined suppress, .dylib])
-		PICFLAGS="-fPIC -DPIC"
-		PICLDFLAGS="-fPIC -DPIC -bundle -fno-common -flat_namespace -undefined suppress"
-		LIBLDFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-		AUDLDFLAGS=""
-		SHARED_SUFFIX=".dylib"
-		;;
-	*)
-		AC_MSG_RESULT([libdl-compatible: -fPIC -DPIC -shared, .so])
-		PICFLAGS="-fPIC -DPIC"
-		PICLDFLAGS="-fPIC -DPIC -shared"
-		LIBLDFLAGS="-fPIC -DPIC -shared"
-		AUDLDFLAGS="-Wl,-export-dynamic $RPATH_VAL"
-		SHARED_SUFFIX=".so"
-		;;
-esac
-AC_SUBST(PICFLAGS)
-AC_SUBST(PICLDFLAGS)
-AC_SUBST(LIBLDFLAGS)
-AC_SUBST(AUDLDFLAGS)
+AM_SHARED_LIB
+
+dnl XXX
+SHARED_SUFFIX=$PLUGIN_SUFFIX
 AC_SUBST(SHARED_SUFFIX)
 AC_DEFINE_UNQUOTED(SHARED_SUFFIX, "${SHARED_SUFFIX}",
 	[Define the shared module suffix extension on your platform.])
@@ -203,11 +192,6 @@
 		;;
 esac
 
-dnl libguess always compiled in
-dnl ========================
-SUBDIR_GUESS="libguess"
-CHARDET_LIBS="../libguess/libguess.a"
-
 dnl chardet support
 dnl ========================
 AC_ARG_ENABLE(chardet,
@@ -462,7 +446,8 @@
 AC_CONFIG_FILES([
 	audacious.pc
 	audclient.pc
-	mk/rules.mk
+	buildsys.mk
+	extra.mk
 	man/audtool.1
 	man/audacious.1
 	src/audacious/audacious.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/extra.mk.in	Mon Sep 17 13:10:19 2007 -0500
@@ -0,0 +1,342 @@
+@SET_MAKE@
+
+srcdir ?= @srcdir@
+top_srcdir ?= @top_srcdir@
+VPATH ?= @srcdir@
+pkgdatadir ?= $(datadir)/@PACKAGE@
+pkglibdir ?= $(libdir)/@PACKAGE@
+pkgincludedir ?= $(includedir)/@PACKAGE@
+top_builddir ?= .
+am__cd ?= CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL ?= @INSTALL@
+install_sh_DATA ?= $(install_sh) -c -m 644
+install_sh_PROGRAM ?= $(install_sh) -c
+install_sh_SCRIPT ?= $(install_sh) -c
+INSTALL_HEADER ?= $(INSTALL_DATA)
+transform ?= $(program_transform_name)
+NORMAL_INSTALL ?= :
+PRE_INSTALL ?= :
+POST_INSTALL ?= :
+NORMAL_UNINSTALL ?= :
+PRE_UNINSTALL ?= :
+POST_UNINSTALL ?= :
+build_triplet ?= @build@
+host_triplet ?= @host@
+target_triplet ?= @target@
+subdir ?= .
+ACLOCAL_M4 ?= $(top_srcdir)/aclocal.m4
+CONFIG_HEADER ?= config.h
+CONFIG_CLEAN_FILES ?= audacious.1 audacious.spec audacious.pc \
+	intl/Makefile
+SOURCES =
+DIST_SOURCES =
+man1dir ?= $(mandir)/man1
+am__installdirs ?= "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)"
+NROFF ?= nroff
+MANS ?= $(man_MANS)
+am__vpath_adj_setup ?= srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj ?= case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir ?= `echo $$p | sed -e 's|^.*/||'`;
+pkgconfigDATA_INSTALL ?= $(INSTALL_DATA)
+DATA ?= $(pkgconfig_DATA)
+ETAGS ?= etags
+CTAGS ?= ctags
+DIST_SUBDIRS ?= $(SUBDIRS)
+DISTFILES ?= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir ?= $(PACKAGE)-$(VERSION)
+top_distdir ?= $(distdir)
+am__remove_distdir ?= \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES ?= $(distdir).tar.gz
+GZIP_ENV ?= --best
+distuninstallcheck_listfiles ?= find . -type f -print
+distcleancheck_listfiles ?= find . -type f -print
+ACLOCAL ?= @ACLOCAL@
+ALLOCA ?= @ALLOCA@
+ALSA_CFLAGS ?= @ALSA_CFLAGS@
+ALSA_LIBS ?= @ALSA_LIBS@
+AMDEP_FALSE ?= @AMDEP_FALSE@
+AMDEP_TRUE ?= @AMDEP_TRUE@
+AMIDIPLUGBACKENDDIR ?= @AMIDIPLUGBACKENDDIR@
+AMTAR ?= @AMTAR@
+AR ?= @AR@
+ARCH_DEFINES ?= @ARCH_DEFINES@
+ARCH_X86_FALSE ?= @ARCH_X86_FALSE@
+ARCH_X86_TRUE ?= @ARCH_X86_TRUE@
+ARTSC_CFLAGS ?= @ARTSC_CFLAGS@
+ARTSC_LIBS ?= @ARTSC_LIBS@
+AUTOCONF ?= @AUTOCONF@
+AUTOHEADER ?= @AUTOHEADER@
+AUTOMAKE ?= @AUTOMAKE@
+AWK ?= @AWK@
+BEEP_DEFINES ?= @BEEP_DEFINES@
+BEEP_PATH ?= @BEEP_PATH@
+BINIO_CFLAGS ?= @BINIO_CFLAGS@
+BINIO_LIBS ?= @BINIO_LIBS@
+BMP_RCPATH ?= @BMP_RCPATH@
+BUILDERS_INCLUDES ?= @BUILDERS_INCLUDES@
+BUILDERS_LDFLAGS ?= @BUILDERS_LDFLAGS@
+BUILD_INCLUDED_LIBINTL ?= @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT ?= @CATOBJEXT@
+CC = @CC@
+CCAS ?= @CCAS@
+CCASFLAGS ?= @CCASFLAGS@
+CCDEPMODE ?= @CCDEPMODE@
+CFLAGS += @CFLAGS@
+CPP = @CPP@
+CPPFLAGS += @CPPFLAGS@
+CXX = @CXX@
+CXXCPP ?= @CXXCPP@
+CXXDEPMODE ?= @CXXDEPMODE@
+CXXFLAGS += @CXXFLAGS@
+CYGPATH_W ?= @CYGPATH_W@
+DATADIRNAME ?= @DATADIRNAME@
+DCT64 ?= @DCT64@
+DBUS_BINDING_TOOL ?= @DBUS_BINDING_TOOL@
+DBUS_SERVICES_TOOL ?= @DBUS_SERVICES_DIR@
+DBUS_CFLAGS ?= @DBUS_CFLAGS@
+DBUS_LIBS ?= @DBUS_LIBS@
+DEFS ?= @DEFS@
+DEPDIR ?= @DEPDIR@
+ECHO ?= @ECHO@
+ECHO_C ?= @ECHO_C@
+ECHO_N ?= @ECHO_N@
+ECHO_T ?= @ECHO_T@
+EFFECT_PLUGINS ?= @EFFECT_PLUGINS@
+EFFECT_PLUGIN_DIR ?= @EFFECT_PLUGIN_DIR@
+EGREP ?= @EGREP@
+ENABLE_AAC_FALSE ?= @ENABLE_AAC_FALSE@
+ENABLE_AAC_TRUE ?= @ENABLE_AAC_TRUE@
+ENABLE_AMIDIPLUG_FALSE ?= @ENABLE_AMIDIPLUG_FALSE@
+ENABLE_AMIDIPLUG_TRUE ?= @ENABLE_AMIDIPLUG_TRUE@
+ENABLE_CROSSFADE_FALSE ?= @ENABLE_CROSSFADE_FALSE@
+ENABLE_CROSSFADE_TRUE ?= @ENABLE_CROSSFADE_TRUE@
+ENABLE_MPG123_FALSE ?= @ENABLE_MPG123_FALSE@
+ENABLE_MPG123_TRUE ?= @ENABLE_MPG123_TRUE@
+ENABLE_MUSEPACK_FALSE ?= @ENABLE_MUSEPACK_FALSE@
+ENABLE_MUSEPACK_TRUE ?= @ENABLE_MUSEPACK_TRUE@
+ENABLE_TIMIDITY_FALSE ?= @ENABLE_TIMIDITY_FALSE@
+ENABLE_TIMIDITY_TRUE ?= @ENABLE_TIMIDITY_TRUE@
+ENABLE_WMA_FALSE ?= @ENABLE_WMA_FALSE@
+ENABLE_WMA_TRUE ?= @ENABLE_WMA_TRUE@
+ESD_CFLAGS ?= @ESD_CFLAGS@
+ESD_LIBS ?= @ESD_LIBS@
+EXEEXT ?= @EXEEXT@
+FLUIDSYNTH_CFLAGS ?= @FLUIDSYNTH_CFLAGS@
+FLUIDSYNTH_LIBS ?= @FLUIDSYNTH_LIBS@
+GENCAT ?= @GENCAT@
+GENERAL_PLUGINS ?= @GENERAL_PLUGINS@
+GENERAL_PLUGIN_DIR ?= @GENERAL_PLUGIN_DIR@
+GLIBC21 ?= @GLIBC21@
+GLIB_CFLAGS ?= @GLIB_CFLAGS@
+GLIB_LIBS ?= @GLIB_LIBS@
+GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
+GMODULE_LIBS ?= @GMODULE_LIBS@
+GMSGFMT ?= @GMSGFMT@
+GNOMEVFS_CFLAGS ?= @GNOMEVFS_CFLAGS@
+GNOMEVFS_LIBS ?= @GNOMEVFS_LIBS@
+GTK_CFLAGS ?= @GTK_CFLAGS@
+GTK_LIBS ?= @GTK_LIBS@
+HARDSID_LDADD ?= @HARDSID_LDADD@
+HAVE_ADPLUG_FALSE ?= @HAVE_ADPLUG_FALSE@
+HAVE_ADPLUG_TRUE ?= @HAVE_ADPLUG_TRUE@
+HAVE_ALSA_FALSE ?= @HAVE_ALSA_FALSE@
+HAVE_ALSA_TRUE ?= @HAVE_ALSA_TRUE@
+HAVE_CDROM_FALSE ?= @HAVE_CDROM_FALSE@
+HAVE_CDROM_TRUE ?= @HAVE_CDROM_TRUE@
+HAVE_ESD_FALSE ?= @HAVE_ESD_FALSE@
+HAVE_ESD_TRUE ?= @HAVE_ESD_TRUE@
+HAVE_FLAC_FALSE ?= @HAVE_FLAC_FALSE@
+HAVE_FLAC_TRUE ?= @HAVE_FLAC_TRUE@
+HAVE_JACK_FALSE ?= @HAVE_JACK_FALSE@
+HAVE_JACK_TRUE ?= @HAVE_JACK_TRUE@
+HAVE_LIBSAMPLERATE_FALSE ?= @HAVE_LIBSAMPLERATE_FALSE@
+HAVE_LIBSAMPLERATE_TRUE ?= @HAVE_LIBSAMPLERATE_TRUE@
+HAVE_LIBSNDFILE_FALSE ?= @HAVE_LIBSNDFILE_FALSE@
+HAVE_LIBSNDFILE_TRUE ?= @HAVE_LIBSNDFILE_TRUE@
+HAVE_LIBVISUAL_FALSE ?= @HAVE_LIBVISUAL_FALSE@
+HAVE_LIBVISUAL_TRUE ?= @HAVE_LIBVISUAL_TRUE@
+HAVE_LINUX_JOYSTICK_FALSE ?= @HAVE_LINUX_JOYSTICK_FALSE@
+HAVE_LINUX_JOYSTICK_TRUE ?= @HAVE_LINUX_JOYSTICK_TRUE@
+HAVE_LIRC_FALSE ?= @HAVE_LIRC_FALSE@
+HAVE_LIRC_TRUE ?= @HAVE_LIRC_TRUE@
+HAVE_MODPLUG_FALSE ?= @HAVE_MODPLUG_FALSE@
+HAVE_MODPLUG_TRUE ?= @HAVE_MODPLUG_TRUE@
+HAVE_OGGVORBIS_FALSE ?= @HAVE_OGGVORBIS_FALSE@
+HAVE_OGGVORBIS_TRUE ?= @HAVE_OGGVORBIS_TRUE@
+HAVE_OSS_FALSE ?= @HAVE_OSS_FALSE@
+HAVE_OSS_TRUE ?= @HAVE_OSS_TRUE@
+HAVE_SIDPLAY_FALSE ?= @HAVE_SIDPLAY_FALSE@
+HAVE_SIDPLAY_TRUE ?= @HAVE_SIDPLAY_TRUE@
+HAVE_SOLARIS_FALSE ?= @HAVE_SOLARIS_FALSE@
+HAVE_SOLARIS_TRUE ?= @HAVE_SOLARIS_TRUE@
+HAVE_SUN_FALSE ?= @HAVE_SUN_FALSE@
+HAVE_SUN_TRUE ?= @HAVE_SUN_TRUE@
+INPUT_PLUGINS ?= @INPUT_PLUGINS@
+INPUT_PLUGIN_DIR ?= @INPUT_PLUGIN_DIR@
+INSTALL_DATA ?= @INSTALL_DATA@
+INSTALL_PROGRAM ?= @INSTALL_PROGRAM@
+INSTALL_SCRIPT ?= @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM ?= @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT ?= @INSTOBJEXT@
+INTLBISON ?= @INTLBISON@
+INTLLIBS ?= @INTLLIBS@
+INTLOBJS ?= @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX ?= @INTL_LIBTOOL_SUFFIX_PREFIX@
+JACK_CFLAGS ?= @JACK_CFLAGS@
+JACK_LIBS ?= @JACK_LIBS@
+LDFLAGS ?= @LDFLAGS@
+LIBBEEP_MAJOR_VERSION ?= @LIBBEEP_MAJOR_VERSION@
+LIBBEEP_MICRO_VERSION ?= @LIBBEEP_MICRO_VERSION@
+LIBBEEP_MINOR_VERSION ?= @LIBBEEP_MINOR_VERSION@
+LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
+LIBFLAC_LIBS ?= @LIBFLAC_LIBS@
+LIBGLADE_CFLAGS ?= @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS ?= @LIBGLADE_LIBS@
+LIBNMS_CFLAGS ?= @LIBNMS_CFLAGS@
+LIBNMS_LIBS ?= @LIBNMS_LIBS@
+LIBNMS_SRC ?= @LIBNMS_SRC@
+LIBICONV ?= @LIBICONV@
+LIBINTL ?= @LIBINTL@
+LIBOBJS ?= @LIBOBJS@
+LIBS ?= @LIBS@
+LIBTOOL ?= @LIBTOOL@
+LIBVISUAL_CFLAGS ?= @LIBVISUAL_CFLAGS@
+LIBVISUAL_LIBS ?= @LIBVISUAL_LIBS@
+LN_S ?= @LN_S@
+LTLIBICONV ?= @LTLIBICONV@
+LTLIBINTL ?= @LTLIBINTL@
+LTLIBOBJS ?= @LTLIBOBJS@
+MAKEINFO ?= @MAKEINFO@
+MKINSTALLDIRS ?= @MKINSTALLDIRS@
+MSGFMT ?= @MSGFMT@
+MSGMERGE ?= @MSGMERGE@
+OBJEXT ?= @OBJEXT@
+OGG_VORBIS_CFLAGS ?= @OGG_VORBIS_CFLAGS@
+OGG_VORBIS_LIBS ?= @OGG_VORBIS_LIBS@
+OSS_LIBS ?= @OSS_LIBS@
+OUTPUT_PLUGINS ?= @OUTPUT_PLUGINS@
+OUTPUT_PLUGIN_DIR ?= @OUTPUT_PLUGIN_DIR@
+PACKAGE ?= @PACKAGE@
+PACKAGE_BUGREPORT ?= @PACKAGE_BUGREPORT@
+PACKAGE_NAME ?= @PACKAGE_NAME@
+PACKAGE_STRING ?= @PACKAGE_STRING@
+PACKAGE_TARNAME ?= @PACKAGE_TARNAME@
+PACKAGE_VERSION ?= @PACKAGE_VERSION@
+PATH_SEPARATOR ?= @PATH_SEPARATOR@
+PC_REQUIRES ?= @PC_REQUIRES@
+PKG_CONFIG ?= @PKG_CONFIG@
+PLUGIN_LDFLAGS ?= @PLUGIN_LDFLAGS@
+POSUB ?= @POSUB@
+RANLIB ?= @RANLIB@
+REGEX_CFLAGS ?= @REGEX_CFLAGS@
+REGEX_LIBS ?= @REGEX_LIBS@
+RESID_LDADD ?= @RESID_LDADD@
+SAMPLERATE_CFLAGS ?= @SAMPLERATE_CFLAGS@
+SAMPLERATE_LIBS ?= @SAMPLERATE_LIBS@
+SDL_CFLAGS ?= @SDL_CFLAGS@
+SDL_CONFIG ?= @SDL_CONFIG@
+SDL_LIBS ?= @SDL_LIBS@
+SET_MAKE ?= @SET_MAKE@
+SHELL ?= @SHELL@
+SIDPLAY1_INCLUDES ?= @SIDPLAY1_INCLUDES@
+SIDPLAY1_LDADD ?= @SIDPLAY1_LDADD@
+SIDPLAY2_INCLUDES ?= @SIDPLAY2_INCLUDES@
+SIDPLAY2_LDADD ?= @SIDPLAY2_LDADD@
+SNDFILE_CFLAGS ?= @SNDFILE_CFLAGS@
+SNDFILE_LIBS ?= @SNDFILE_LIBS@
+STRIP ?= @STRIP@
+USE_DBUS ?= @USE_DBUS@
+USE_INCLUDED_LIBINTL ?= @USE_INCLUDED_LIBINTL@
+USE_NLS ?= @USE_NLS@
+USE_X86ASM_FALSE ?= @USE_X86ASM_FALSE@
+USE_X86ASM_TRUE ?= @USE_X86ASM_TRUE@
+VERSION ?= @VERSION@
+VISUALIZATION_PLUGINS ?= @VISUALIZATION_PLUGINS@
+VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@
+XGETTEXT ?= @XGETTEXT@
+ac_ct_AR ?= @ac_ct_AR@
+ac_ct_CC ?= @ac_ct_CC@
+ac_ct_CXX ?= @ac_ct_CXX@
+ac_ct_RANLIB ?= @ac_ct_RANLIB@
+ac_ct_STRIP ?= @ac_ct_STRIP@
+am__fastdepCC_FALSE ?= @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE ?= @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE ?= @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE ?= @am__fastdepCXX_TRUE@
+am__include ?= @am__include@
+am__leading_dot ?= @am__leading_dot@
+am__quote ?= @am__quote@
+am__tar ?= @am__tar@
+am__untar ?= @am__untar@
+beepdir ?= @beepdir@
+bindir ?= @bindir@
+build ?= @build@
+build_alias ?= @build_alias@
+build_cpu ?= @build_cpu@
+build_os ?= @build_os@
+build_vendor ?= @build_vendor@
+datadir ?= @datadir@
+datarootdir ?= @datarootdir@
+exec_prefix ?= @exec_prefix@
+host ?= @host@
+host_alias ?= @host_alias@
+host_cpu ?= @host_cpu@
+host_os ?= @host_os@
+host_vendor ?= @host_vendor@
+includedir ?= @includedir@
+infodir ?= @infodir@
+install_sh ?= @install_sh@
+libdir ?= @libdir@
+libexecdir ?= @libexecdir@
+localedir ?= @localedir@
+localstatedir ?= @localstatedir@
+mandir ?= @mandir@
+mkdir_p ?= @mkdir_p@
+oldincludedir ?= @oldincludedir@
+plugindir ?= @plugindir@
+pluginsubs ?= @pluginsubs@
+prefix ?= @prefix@
+program_transform_name ?= @program_transform_name@
+sbindir ?= @sbindir@
+sharedstatedir ?= @sharedstatedir@
+sysconfdir ?= @sysconfdir@
+target ?= @target@
+target_alias ?= @target_alias@
+target_cpu ?= @target_cpu@
+target_os ?= @target_os@
+target_vendor ?= @target_vendor@
+WAV_SNDFILE ?= @WAV_SNDFILE@
+VFS_BACKEND ?= @VFS_BACKEND@
+CURL_CFLAGS ?= @CURL_CFLAGS@
+CURL_LIBS ?= @CURL_LIBS@
+MUSICBRAINZ_LIBS ?= @MUSICBRAINZ_LIBS@
+CHARDET_LIBS ?= @CHARDET_LIBS@
+samplerate_CFLAGS ?= @samplerate_CFLAGS@
+samplerate_LIBS ?= @samplerate_LIBS@
+SUBDIR_GUESS ?= @SUBDIR_GUESS@
+LIBNOTIFY_CFLAGS ?= @LIBNOTIFY_CFLAGS@
+LIBNOTIFY_LIBS ?= @LIBNOTIFY_LIBS@
+XML_CPPFLAGS ?= @XML_CPPFLAGS@
+XML_LIBS ?= @XML_LIBS@
+CONTAINER_PLUGIN_DIR ?= @CONTAINER_PLUGIN_DIR@
+CONTAINER_PLUGINS ?= @CONTAINER_PLUGINS@
+SHARED_SUFFIX ?= @SHARED_SUFFIX@
+PICFLAGS ?= @PICFLAGS@
+PICLDFLAGS ?= @PICLDFLAGS@
+LIBLDFLAGS ?= @LIBLDFLAGS@
+AUDLDFLAGS ?= @AUDLDFLAGS@
+INTL_OBJECTIVE ?= @INTL_OBJECTIVE@
+LIBMCS_CFLAGS ?= @LIBMCS_CFLAGS@
+LIBMCS_LIBS ?= @LIBMCS_LIBS@
+MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
+MOWGLI_LIBS ?= @MOWGLI_LIBS@
+LIBAUDCLIENT_OBJECTIVE ?= @LIBAUDCLIENT_OBJECTIVE@
+TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
+TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
+PCH ?= @PCH@
--- a/icons/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/icons/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,7 +1,27 @@
-include ../mk/rules.mk
-include ../mk/init.mk
+include ../buildsys.mk
 
 pixmapsdir = $(datadir)/pixmaps
-OBJECTIVE_DATA = audacious.png:$(pixmapsdir)
+
+install-extra:
+	y="audacious.png"; \
+	for i in $$y; do \
+	        ${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${pixmapsdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${pixmapsdir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../mk/objective.mk
+uninstall-extra:
+	y="audacious.png"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${pixmapsdir}/$$i ]; then \
+			if rm -f ${DESTDIR}${pixmapsdir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/m4/sharedlib.m4	Mon Sep 17 13:10:19 2007 -0500
@@ -0,0 +1,107 @@
+dnl
+dnl Copyright (c) 2007, Jonathan Schleifer <js@h3c.de>
+dnl
+dnl Permission to use, copy, modify, and/or distribute this software for any
+dnl purpose with or without fee is hereby granted, provided that the above
+dnl copyright notice and this permission notice is present in all copies.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+dnl AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+dnl ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+dnl LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+dnl CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+dnl SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+dnl CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+dnl POSSIBILITY OF SUCH DAMAGE.
+dnl
+
+AC_DEFUN([AM_SHARED_LIB], [
+	AC_MSG_CHECKING(for shared library system)
+	case "$target" in
+		intel-apple-*)
+			AC_MSG_RESULT([Mac OS X (Intel)])
+			LIB_CPPFLAGS='-DPIC'
+			LIB_CFLAGS='-fPIC'
+			LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.dylib'
+			PLUGIN_CPPFLAGS=''
+			PLUGIN_CFLAGS=''
+			PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress'
+			PLUGIN_SUFFIX='.impl'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+			;;
+		*-apple-*)
+			AC_MSG_RESULT(Mac OS X)
+			LIB_CPPFLAGS='-DPIC'
+			LIB_CFLAGS=''
+			LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.dylib'
+			PLUGIN_CPPFLAGS=''
+			PLUGIN_CFLAGS=''
+			PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress'
+			PLUGIN_SUFFIX='.impl'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+			;;
+		*-sun-* | *-openbsd-* | *-mirbsd-*)
+			AC_MSG_RESULT(Solaris)
+			LIB_CPPFLAGS='-DPIC'
+			LIB_CFLAGS='-fPIC'
+			LIB_LDFLAGS='-shared -fPIC'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.so'
+			PLUGIN_CPPFLAGS='-DPIC'
+			PLUGIN_CFLAGS='-fPIC'
+			PLUGIN_LDFLAGS='-shared -fPIC'
+			PLUGIN_SUFFIX='.so'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+			;;
+		*-*-mingw32)
+			AC_MSG_RESULT(MinGW32)
+			LIB_CPPFLAGS='-DPIC'
+			LIB_CFLAGS=''
+			LIB_LDFLAGS='-shared'
+			LIB_PREFIX=''
+			LIB_SUFFIX='.dll'
+			PLUGIN_CPPFLAGS=''
+			PLUGIN_CFLAGS=''
+			PLUGIN_LDFLAGS=''
+			PLUGIN_SUFFIX='.dll'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i'
+			;;
+		*)
+			AC_MSG_RESULT(POSIX)
+			LIB_CPPFLAGS='-DPIC'
+			LIB_CFLAGS='-fPIC'
+			LIB_LDFLAGS='-shared -fPIC'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.so'
+			PLUGIN_CPPFLAGS='-DPIC'
+			PLUGIN_CFLAGS='-fPIC'
+			PLUGIN_LDFLAGS='-shared -fPIC'
+			PLUGIN_SUFFIX='.so'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
+			;;
+	esac
+
+	AC_SUBST(LIB_CPPFLAGS)
+	AC_SUBST(LIB_CFLAGS)
+	AC_SUBST(LIB_LDFLAGS)
+	AC_SUBST(LIB_PREFIX)
+	AC_SUBST(LIB_SUFFIX)
+	AC_SUBST(PLUGIN_CPPFLAGS)
+	AC_SUBST(PLUGIN_CFLAGS)
+	AC_SUBST(PLUGIN_LDFLAGS)
+	AC_SUBST(PLUGIN_SUFFIX)
+	AC_SUBST(INSTALL_LIB)
+	AC_SUBST(UNINSTALL_LIB)
+])
--- a/man/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/man/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,7 +1,3 @@
-include ../mk/rules.mk
-include ../mk/init.mk
-include ../mk/objective.mk
+MAN = audacious.1 audtool.1
 
-OBJECTIVE_DATA =	\
-	audtool.1:$(man1dir) \
-	audacious.1:$(man1dir)
+include ../buildsys.mk
--- a/mk/init.mk	Sat Sep 15 11:07:24 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# 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	Sat Sep 15 11:07:24 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
-default: all
-all: build
-
-.SUFFIXES: .cxx .cc
-
-install: build
-	$(MAKE) install-prehook
-	@for i in $(BINDIR) $(LIBDIR) $(INCLUDEDIR); do \
-		if [ ! -d $(DESTDIR)/$$i ]; then \
-			$(INSTALL) -d -m 755 $(DESTDIR)/$$i; \
-		fi; \
-	done;
-	@if [ "x$(OVERLAYS)" != "x" ]; then \
-		for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[installing overlay: $$i]"; \
-			fi; \
-			cd $$i; OVERLAYS="" $(MAKE) install || exit; cd ..; \
-		done; \
-	fi
-	@if [ "x$(SUBDIRS)" != "x" ]; then \
-		for i in $(SUBDIRS); do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[installing subobjective: $$i]"; \
-			fi; \
-			cd $$i; OVERLAYS="" $(MAKE) install || exit; cd ..; \
-		done; \
-	fi
-	@if [ "x$(OBJECTIVE_DIRECTORIES)" != "x" ]; then \
-		for i in $(OBJECTIVE_DIRECTORIES); do \
-			printf "%10s     %-20s\n" MKDIR $$i; \
-			$(INSTALL) -d -m 755 $(DESTDIR)/$$i; \
-		done; \
-	fi
-	@if [ "x$(HEADERS)" != "x" ]; then \
-		for i in $(HEADERS); do \
-			printf "%10s     %-20s\n" INSTALL $$i; \
-			$(INSTALL_DATA) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(INCLUDEDIR)/$$i; \
-		done; \
-	fi
-	@if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \
-		for i in $(OBJECTIVE_LIBS); do \
-			printf "%10s     %-20s\n" INSTALL $$i; \
-			$(INSTALL) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(LIBDIR)/$$i; \
-		done; \
-	fi
-	@if [ "x$(OBJECTIVE_BINS)" != "x" ]; then \
-		for i in $(OBJECTIVE_BINS); do \
-			printf "%10s     %-20s\n" INSTALL $$i; \
-			$(INSTALL) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(BINDIR)/$$i; \
-		done; \
-	fi;
-	@if [ "x$(OBJECTIVE_DATA)" != "x" ]; then \
-		for i in $(OBJECTIVE_DATA); do \
-			source=`echo $$i | cut -d ":" -f1`; \
-			destination=`echo $$i | cut -d ":" -f2`; \
-			if [ ! -d $(DESTDIR)/$$destination ]; then \
-				$(INSTALL) -d -m 755 $(DESTDIR)/$$destination; \
-			fi; \
-			printf "%10s     %-20s\n" INSTALL $$source; \
-			$(INSTALL_DATA) $(INSTALL_OVERRIDE) $$source $(DESTDIR)/$$destination; \
-		done; \
-	fi
-	$(MAKE) install-posthook
-	@if [ $(VERBOSITY) -gt 0 ]; then \
-		echo "[all objectives installed]"; \
-	fi
-
-clean:
-	$(MAKE) clean-prehook
-	@if [ "x$(OVERLAYS)" != "x" ]; then \
-		for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[cleaning overlay: $$i]"; \
-			fi; \
-			cd $$i; OVERLAYS="" $(MAKE) clean || exit; cd ..; \
-		done; \
-	fi
-	@if [ "x$(SUBDIRS)" != "x" ]; then \
-		for i in $(SUBDIRS); do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[cleaning subobjective: $$i]"; \
-			fi; \
-			cd $$i; OVERLAYS="" $(MAKE) clean || exit; cd ..; \
-		done; \
-	fi
-	$(MAKE) clean-posthook
-	rm -f *.o *.lo *.so *.a *.sl *.h.gch .depend-done .depend
-	touch .depend
-	@if [ "x$(OBJECTIVE_BINS)" != "x" ]; then \
-		for i in $(OBJECTIVE_BINS); do \
-			rm -f $$i; \
-		done; \
-	fi
-	@if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \
-		for i in $(OBJECTIVE_LIBS); do \
-			rm -f $$i; \
-		done; \
-	fi
-	@if [ "x$(OBJECTIVE_LIBS_NOINST)" != "x" ]; then \
-		for i in $(OBJECTIVE_LIBS_NOINST); do \
-			rm -f $$i; \
-		done; \
-	fi
-	@if [ $(VERBOSITY) -gt 0 ]; then \
-		echo "[all objectives cleaned]"; \
-	fi
-
-distclean: clean
-	@if [ "x$(OVERLAYS)" != "x" ]; then \
-		for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[distcleaning overlay: $$i]"; \
-			fi; \
-			cd $$i; OVERLAYS="" $(MAKE) distclean || exit; cd ..; \
-		done; \
-	fi
-	@if [ "x$(SUBDIRS)" != "x" ]; then \
-		for i in $(SUBDIRS); do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[distcleaning subobjective: $$i]"; \
-			fi; \
-			cd $$i; OVERLAYS="" $(MAKE) distclean || exit; cd ..; \
-		done; \
-	fi
-	@if [ -f Makefile.in ]; then \
-		rm -f Makefile; \
-	fi
-	@if [ -f mk/rules.mk.in ]; then \
-		rm -f mk/rules.mk; \
-	fi
-	rm -f config.log config.status
-
-build: depend
-	$(MAKE) build-prehook
-	@if [ "x$(OVERLAYS)" != "x" ]; then \
-		for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[building overlay: $$i]"; \
-			fi; \
-			cd $$i; OVERLAYS="" $(MAKE) || exit; cd ..; \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[finished overlay: $$i]"; \
-			fi; \
-		done; \
-	fi
-	@if [ "x$(SUBDIRS)" != "x" ]; then \
-		for i in $(SUBDIRS); do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[building subobjective: $$i]"; \
-			fi; \
-			cd $$i; OVERLAYS="" $(MAKE) || exit; cd ..; \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[finished subobjective: $$i]"; \
-			fi; \
-		done; \
-	fi
-	@if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \
-		for i in $(OBJECTIVE_LIBS); do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[building library objective: $$i]"; \
-			fi; \
-			$(MAKE) $$i || exit; \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[finished library objective: $$i]"; \
-			fi; \
-		done; \
-	fi
-	@if [ "x$(OBJECTIVE_LIBS_NOINST)" != "x" ]; then \
-		for i in $(OBJECTIVE_LIBS_NOINST); do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[building library dependency: $$i]"; \
-			fi; \
-			$(MAKE) $$i || exit; \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[finished library dependency: $$i]"; \
-			fi; \
-		done; \
-	fi
-	@if test "x$(OBJECTIVE_BINS)" != "x"; then \
-		for i in $(OBJECTIVE_BINS); do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[building binary objective: $$i]"; \
-			fi; \
-			$(MAKE) $$i || exit; \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[finished binary objective: $$i]"; \
-			fi; \
-		done; \
-	fi
-	$(MAKE) build-posthook
-	@if [ $(VERBOSITY) -gt 0 ]; then \
-		echo "[all objectives built]"; \
-	fi
-
-.c.o:
-	@if [ $(SHOW_CFLAGS) -eq 1 ]; then	\
-		printf "%10s     %-20s (%s)\n" CC $< "${CFLAGS}";	\
-	else \
-		printf "%10s     %-20s\n" CC $<;	\
-	fi;
-	$(CC) $(CFLAGS) -c $< -o $@
-
-.cc.o .cxx.o:
-	@if [ $(SHOW_CFLAGS) -eq 1 ]; then	\
-		printf "%10s     %-20s (%s)\n" CXX $< "${CXXFLAGS}";	\
-	else \
-		printf "%10s     %-20s\n" CXX $<;	\
-	fi;
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-pch:
-	@for i in *.h; do \
-		if [ $(SHOW_CFLAGS) -eq 1 ]; then	\
-			printf "%10s     %-20s (%s)\n" "CC [HDR]" $$i "${CFLAGS}";	\
-		else \
-			printf "%10s     %-20s\n" "CC [HDR]" $$i;	\
-		fi; \
-		$(CC) $(CFLAGS) -c $$i -o $$i.gch; \
-	done
-
-$(OBJECTIVE_LIBS): $(OBJECTS)
-	if [ "x$(OBJECTS)" != "x" ]; then \
-		$(MAKE) $(OBJECTS) || exit;		\
-		printf "%10s     %-20s\n" LINK $@; \
-		(if [ "x$(SHARED_SUFFIX)" = "x.so" ]; then \
-			(if [ "x$(OBJECTIVE_SONAME_SUFFIX)" != "x" ]; then \
-				$(CC) $(PICLDFLAGS) -o $@ -Wl,-h$@.$(OBJECTIVE_SONAME_SUFFIX) $(OBJECTS) $(LDFLAGS) $(LIBADD); \
-			else \
-				$(CC) $(PICLDFLAGS) -o $@ -Wl,-h$@ $(OBJECTS) $(LDFLAGS) $(LIBADD); \
-			fi;) \
-		 else \
-			$(CC) $(PICLDFLAGS) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBADD); \
-		 fi;) \
-	fi
-
-$(OBJECTIVE_LIBS_NOINST): $(OBJECTS)
-	if [ "x$(OBJECTS)" != "x" ]; then \
-		$(MAKE) $(OBJECTS) || exit;		\
-		printf "%10s     %-20s\n" LINK $@; \
-		$(AR) cr $@ $(OBJECTS); \
-	fi
-
-$(OBJECTIVE_BINS): $(SOURCES) $(OBJECTS)
-	if [ "x$(OBJECTS)" != "x" ]; then \
-		$(MAKE) $(OBJECTS) || exit;		\
-		printf "%10s     %-20s\n" LINK $@; \
-		$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBADD); \
-	fi
-
-clean-prehook:
-clean-posthook:
-build-prehook:
-build-posthook:
-install-prehook:
-install-posthook:
-
-mk/rules.mk:
-	@if [ -f "configure" ]; then \
-		echo "[building rules.mk for posix target, run configure manually if you do not want this]"; \
-		sh configure $(CONFIG_OPTS); \
-		echo "[complete]"; \
-	fi
-
-.PHONY: .depend depend depend-prehook clean distclean
-.depend:
-depend-prehook:
-
-# default depend rule. if something else is needed -- override depend target
-depend:
-	$(MAKE) depend-prehook
-	@if [ "x$(SUBDIRS)" != "x" ]; then \
-		for i in $(SUBDIRS); do \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[building depend file for subobjective: $$i]"; \
-			fi; \
-			cd $$i; touch .depend; $(MAKE) depend || exit; cd ..; \
-			if [ $(VERBOSITY) -gt 0 ]; then \
-				echo "[finished subobjective: $$i]"; \
-			fi; \
-		done; \
-	fi
-	if [ ! -f .depend-done ]; then \
-		for i in ${SOURCES}; do \
-			echo "[generating dependencies for objective: $$i]"; \
-			${CC} -MM ${PICFLAGS} ${CPPFLAGS} ${CFLAGS} $$i >> .depend; \
-		done; \
-		touch .depend-done; \
-	fi;
-
-# compatibility with automake follows
-am--refresh:
-
-include .depend
--- a/mk/rules.mk.in	Sat Sep 15 11:07:24 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,342 +0,0 @@
-@SET_MAKE@
-
-srcdir ?= @srcdir@
-top_srcdir ?= @top_srcdir@
-VPATH ?= @srcdir@
-pkgdatadir ?= $(datadir)/@PACKAGE@
-pkglibdir ?= $(libdir)/@PACKAGE@
-pkgincludedir ?= $(includedir)/@PACKAGE@
-top_builddir ?= .
-am__cd ?= CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL ?= @INSTALL@
-install_sh_DATA ?= $(install_sh) -c -m 644
-install_sh_PROGRAM ?= $(install_sh) -c
-install_sh_SCRIPT ?= $(install_sh) -c
-INSTALL_HEADER ?= $(INSTALL_DATA)
-transform ?= $(program_transform_name)
-NORMAL_INSTALL ?= :
-PRE_INSTALL ?= :
-POST_INSTALL ?= :
-NORMAL_UNINSTALL ?= :
-PRE_UNINSTALL ?= :
-POST_UNINSTALL ?= :
-build_triplet ?= @build@
-host_triplet ?= @host@
-target_triplet ?= @target@
-subdir ?= .
-ACLOCAL_M4 ?= $(top_srcdir)/aclocal.m4
-CONFIG_HEADER ?= config.h
-CONFIG_CLEAN_FILES ?= audacious.1 audacious.spec audacious.pc \
-	intl/Makefile
-SOURCES =
-DIST_SOURCES =
-man1dir ?= $(mandir)/man1
-am__installdirs ?= "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)"
-NROFF ?= nroff
-MANS ?= $(man_MANS)
-am__vpath_adj_setup ?= srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj ?= case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir ?= `echo $$p | sed -e 's|^.*/||'`;
-pkgconfigDATA_INSTALL ?= $(INSTALL_DATA)
-DATA ?= $(pkgconfig_DATA)
-ETAGS ?= etags
-CTAGS ?= ctags
-DIST_SUBDIRS ?= $(SUBDIRS)
-DISTFILES ?= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir ?= $(PACKAGE)-$(VERSION)
-top_distdir ?= $(distdir)
-am__remove_distdir ?= \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES ?= $(distdir).tar.gz
-GZIP_ENV ?= --best
-distuninstallcheck_listfiles ?= find . -type f -print
-distcleancheck_listfiles ?= find . -type f -print
-ACLOCAL ?= @ACLOCAL@
-ALLOCA ?= @ALLOCA@
-ALSA_CFLAGS ?= @ALSA_CFLAGS@
-ALSA_LIBS ?= @ALSA_LIBS@
-AMDEP_FALSE ?= @AMDEP_FALSE@
-AMDEP_TRUE ?= @AMDEP_TRUE@
-AMIDIPLUGBACKENDDIR ?= @AMIDIPLUGBACKENDDIR@
-AMTAR ?= @AMTAR@
-AR ?= @AR@
-ARCH_DEFINES ?= @ARCH_DEFINES@
-ARCH_X86_FALSE ?= @ARCH_X86_FALSE@
-ARCH_X86_TRUE ?= @ARCH_X86_TRUE@
-ARTSC_CFLAGS ?= @ARTSC_CFLAGS@
-ARTSC_LIBS ?= @ARTSC_LIBS@
-AUTOCONF ?= @AUTOCONF@
-AUTOHEADER ?= @AUTOHEADER@
-AUTOMAKE ?= @AUTOMAKE@
-AWK ?= @AWK@
-BEEP_DEFINES ?= @BEEP_DEFINES@
-BEEP_PATH ?= @BEEP_PATH@
-BINIO_CFLAGS ?= @BINIO_CFLAGS@
-BINIO_LIBS ?= @BINIO_LIBS@
-BMP_RCPATH ?= @BMP_RCPATH@
-BUILDERS_INCLUDES ?= @BUILDERS_INCLUDES@
-BUILDERS_LDFLAGS ?= @BUILDERS_LDFLAGS@
-BUILD_INCLUDED_LIBINTL ?= @BUILD_INCLUDED_LIBINTL@
-CATOBJEXT ?= @CATOBJEXT@
-CC = @CC@
-CCAS ?= @CCAS@
-CCASFLAGS ?= @CCASFLAGS@
-CCDEPMODE ?= @CCDEPMODE@
-CFLAGS += @CFLAGS@
-CPP = @CPP@
-CPPFLAGS += @CPPFLAGS@
-CXX = @CXX@
-CXXCPP ?= @CXXCPP@
-CXXDEPMODE ?= @CXXDEPMODE@
-CXXFLAGS += @CXXFLAGS@
-CYGPATH_W ?= @CYGPATH_W@
-DATADIRNAME ?= @DATADIRNAME@
-DCT64 ?= @DCT64@
-DBUS_BINDING_TOOL ?= @DBUS_BINDING_TOOL@
-DBUS_SERVICES_TOOL ?= @DBUS_SERVICES_DIR@
-DBUS_CFLAGS ?= @DBUS_CFLAGS@
-DBUS_LIBS ?= @DBUS_LIBS@
-DEFS ?= @DEFS@
-DEPDIR ?= @DEPDIR@
-ECHO ?= @ECHO@
-ECHO_C ?= @ECHO_C@
-ECHO_N ?= @ECHO_N@
-ECHO_T ?= @ECHO_T@
-EFFECT_PLUGINS ?= @EFFECT_PLUGINS@
-EFFECT_PLUGIN_DIR ?= @EFFECT_PLUGIN_DIR@
-EGREP ?= @EGREP@
-ENABLE_AAC_FALSE ?= @ENABLE_AAC_FALSE@
-ENABLE_AAC_TRUE ?= @ENABLE_AAC_TRUE@
-ENABLE_AMIDIPLUG_FALSE ?= @ENABLE_AMIDIPLUG_FALSE@
-ENABLE_AMIDIPLUG_TRUE ?= @ENABLE_AMIDIPLUG_TRUE@
-ENABLE_CROSSFADE_FALSE ?= @ENABLE_CROSSFADE_FALSE@
-ENABLE_CROSSFADE_TRUE ?= @ENABLE_CROSSFADE_TRUE@
-ENABLE_MPG123_FALSE ?= @ENABLE_MPG123_FALSE@
-ENABLE_MPG123_TRUE ?= @ENABLE_MPG123_TRUE@
-ENABLE_MUSEPACK_FALSE ?= @ENABLE_MUSEPACK_FALSE@
-ENABLE_MUSEPACK_TRUE ?= @ENABLE_MUSEPACK_TRUE@
-ENABLE_TIMIDITY_FALSE ?= @ENABLE_TIMIDITY_FALSE@
-ENABLE_TIMIDITY_TRUE ?= @ENABLE_TIMIDITY_TRUE@
-ENABLE_WMA_FALSE ?= @ENABLE_WMA_FALSE@
-ENABLE_WMA_TRUE ?= @ENABLE_WMA_TRUE@
-ESD_CFLAGS ?= @ESD_CFLAGS@
-ESD_LIBS ?= @ESD_LIBS@
-EXEEXT ?= @EXEEXT@
-FLUIDSYNTH_CFLAGS ?= @FLUIDSYNTH_CFLAGS@
-FLUIDSYNTH_LIBS ?= @FLUIDSYNTH_LIBS@
-GENCAT ?= @GENCAT@
-GENERAL_PLUGINS ?= @GENERAL_PLUGINS@
-GENERAL_PLUGIN_DIR ?= @GENERAL_PLUGIN_DIR@
-GLIBC21 ?= @GLIBC21@
-GLIB_CFLAGS ?= @GLIB_CFLAGS@
-GLIB_LIBS ?= @GLIB_LIBS@
-GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
-GMODULE_LIBS ?= @GMODULE_LIBS@
-GMSGFMT ?= @GMSGFMT@
-GNOMEVFS_CFLAGS ?= @GNOMEVFS_CFLAGS@
-GNOMEVFS_LIBS ?= @GNOMEVFS_LIBS@
-GTK_CFLAGS ?= @GTK_CFLAGS@
-GTK_LIBS ?= @GTK_LIBS@
-HARDSID_LDADD ?= @HARDSID_LDADD@
-HAVE_ADPLUG_FALSE ?= @HAVE_ADPLUG_FALSE@
-HAVE_ADPLUG_TRUE ?= @HAVE_ADPLUG_TRUE@
-HAVE_ALSA_FALSE ?= @HAVE_ALSA_FALSE@
-HAVE_ALSA_TRUE ?= @HAVE_ALSA_TRUE@
-HAVE_CDROM_FALSE ?= @HAVE_CDROM_FALSE@
-HAVE_CDROM_TRUE ?= @HAVE_CDROM_TRUE@
-HAVE_ESD_FALSE ?= @HAVE_ESD_FALSE@
-HAVE_ESD_TRUE ?= @HAVE_ESD_TRUE@
-HAVE_FLAC_FALSE ?= @HAVE_FLAC_FALSE@
-HAVE_FLAC_TRUE ?= @HAVE_FLAC_TRUE@
-HAVE_JACK_FALSE ?= @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE ?= @HAVE_JACK_TRUE@
-HAVE_LIBSAMPLERATE_FALSE ?= @HAVE_LIBSAMPLERATE_FALSE@
-HAVE_LIBSAMPLERATE_TRUE ?= @HAVE_LIBSAMPLERATE_TRUE@
-HAVE_LIBSNDFILE_FALSE ?= @HAVE_LIBSNDFILE_FALSE@
-HAVE_LIBSNDFILE_TRUE ?= @HAVE_LIBSNDFILE_TRUE@
-HAVE_LIBVISUAL_FALSE ?= @HAVE_LIBVISUAL_FALSE@
-HAVE_LIBVISUAL_TRUE ?= @HAVE_LIBVISUAL_TRUE@
-HAVE_LINUX_JOYSTICK_FALSE ?= @HAVE_LINUX_JOYSTICK_FALSE@
-HAVE_LINUX_JOYSTICK_TRUE ?= @HAVE_LINUX_JOYSTICK_TRUE@
-HAVE_LIRC_FALSE ?= @HAVE_LIRC_FALSE@
-HAVE_LIRC_TRUE ?= @HAVE_LIRC_TRUE@
-HAVE_MODPLUG_FALSE ?= @HAVE_MODPLUG_FALSE@
-HAVE_MODPLUG_TRUE ?= @HAVE_MODPLUG_TRUE@
-HAVE_OGGVORBIS_FALSE ?= @HAVE_OGGVORBIS_FALSE@
-HAVE_OGGVORBIS_TRUE ?= @HAVE_OGGVORBIS_TRUE@
-HAVE_OSS_FALSE ?= @HAVE_OSS_FALSE@
-HAVE_OSS_TRUE ?= @HAVE_OSS_TRUE@
-HAVE_SIDPLAY_FALSE ?= @HAVE_SIDPLAY_FALSE@
-HAVE_SIDPLAY_TRUE ?= @HAVE_SIDPLAY_TRUE@
-HAVE_SOLARIS_FALSE ?= @HAVE_SOLARIS_FALSE@
-HAVE_SOLARIS_TRUE ?= @HAVE_SOLARIS_TRUE@
-HAVE_SUN_FALSE ?= @HAVE_SUN_FALSE@
-HAVE_SUN_TRUE ?= @HAVE_SUN_TRUE@
-INPUT_PLUGINS ?= @INPUT_PLUGINS@
-INPUT_PLUGIN_DIR ?= @INPUT_PLUGIN_DIR@
-INSTALL_DATA ?= @INSTALL_DATA@
-INSTALL_PROGRAM ?= @INSTALL_PROGRAM@
-INSTALL_SCRIPT ?= @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM ?= @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT ?= @INSTOBJEXT@
-INTLBISON ?= @INTLBISON@
-INTLLIBS ?= @INTLLIBS@
-INTLOBJS ?= @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX ?= @INTL_LIBTOOL_SUFFIX_PREFIX@
-JACK_CFLAGS ?= @JACK_CFLAGS@
-JACK_LIBS ?= @JACK_LIBS@
-LDFLAGS ?= @LDFLAGS@
-LIBBEEP_MAJOR_VERSION ?= @LIBBEEP_MAJOR_VERSION@
-LIBBEEP_MICRO_VERSION ?= @LIBBEEP_MICRO_VERSION@
-LIBBEEP_MINOR_VERSION ?= @LIBBEEP_MINOR_VERSION@
-LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
-LIBFLAC_LIBS ?= @LIBFLAC_LIBS@
-LIBGLADE_CFLAGS ?= @LIBGLADE_CFLAGS@
-LIBGLADE_LIBS ?= @LIBGLADE_LIBS@
-LIBNMS_CFLAGS ?= @LIBNMS_CFLAGS@
-LIBNMS_LIBS ?= @LIBNMS_LIBS@
-LIBNMS_SRC ?= @LIBNMS_SRC@
-LIBICONV ?= @LIBICONV@
-LIBINTL ?= @LIBINTL@
-LIBOBJS ?= @LIBOBJS@
-LIBS ?= @LIBS@
-LIBTOOL ?= @LIBTOOL@
-LIBVISUAL_CFLAGS ?= @LIBVISUAL_CFLAGS@
-LIBVISUAL_LIBS ?= @LIBVISUAL_LIBS@
-LN_S ?= @LN_S@
-LTLIBICONV ?= @LTLIBICONV@
-LTLIBINTL ?= @LTLIBINTL@
-LTLIBOBJS ?= @LTLIBOBJS@
-MAKEINFO ?= @MAKEINFO@
-MKINSTALLDIRS ?= @MKINSTALLDIRS@
-MSGFMT ?= @MSGFMT@
-MSGMERGE ?= @MSGMERGE@
-OBJEXT ?= @OBJEXT@
-OGG_VORBIS_CFLAGS ?= @OGG_VORBIS_CFLAGS@
-OGG_VORBIS_LIBS ?= @OGG_VORBIS_LIBS@
-OSS_LIBS ?= @OSS_LIBS@
-OUTPUT_PLUGINS ?= @OUTPUT_PLUGINS@
-OUTPUT_PLUGIN_DIR ?= @OUTPUT_PLUGIN_DIR@
-PACKAGE ?= @PACKAGE@
-PACKAGE_BUGREPORT ?= @PACKAGE_BUGREPORT@
-PACKAGE_NAME ?= @PACKAGE_NAME@
-PACKAGE_STRING ?= @PACKAGE_STRING@
-PACKAGE_TARNAME ?= @PACKAGE_TARNAME@
-PACKAGE_VERSION ?= @PACKAGE_VERSION@
-PATH_SEPARATOR ?= @PATH_SEPARATOR@
-PC_REQUIRES ?= @PC_REQUIRES@
-PKG_CONFIG ?= @PKG_CONFIG@
-PLUGIN_LDFLAGS ?= @PLUGIN_LDFLAGS@
-POSUB ?= @POSUB@
-RANLIB ?= @RANLIB@
-REGEX_CFLAGS ?= @REGEX_CFLAGS@
-REGEX_LIBS ?= @REGEX_LIBS@
-RESID_LDADD ?= @RESID_LDADD@
-SAMPLERATE_CFLAGS ?= @SAMPLERATE_CFLAGS@
-SAMPLERATE_LIBS ?= @SAMPLERATE_LIBS@
-SDL_CFLAGS ?= @SDL_CFLAGS@
-SDL_CONFIG ?= @SDL_CONFIG@
-SDL_LIBS ?= @SDL_LIBS@
-SET_MAKE ?= @SET_MAKE@
-SHELL ?= @SHELL@
-SIDPLAY1_INCLUDES ?= @SIDPLAY1_INCLUDES@
-SIDPLAY1_LDADD ?= @SIDPLAY1_LDADD@
-SIDPLAY2_INCLUDES ?= @SIDPLAY2_INCLUDES@
-SIDPLAY2_LDADD ?= @SIDPLAY2_LDADD@
-SNDFILE_CFLAGS ?= @SNDFILE_CFLAGS@
-SNDFILE_LIBS ?= @SNDFILE_LIBS@
-STRIP ?= @STRIP@
-USE_DBUS ?= @USE_DBUS@
-USE_INCLUDED_LIBINTL ?= @USE_INCLUDED_LIBINTL@
-USE_NLS ?= @USE_NLS@
-USE_X86ASM_FALSE ?= @USE_X86ASM_FALSE@
-USE_X86ASM_TRUE ?= @USE_X86ASM_TRUE@
-VERSION ?= @VERSION@
-VISUALIZATION_PLUGINS ?= @VISUALIZATION_PLUGINS@
-VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@
-XGETTEXT ?= @XGETTEXT@
-ac_ct_AR ?= @ac_ct_AR@
-ac_ct_CC ?= @ac_ct_CC@
-ac_ct_CXX ?= @ac_ct_CXX@
-ac_ct_RANLIB ?= @ac_ct_RANLIB@
-ac_ct_STRIP ?= @ac_ct_STRIP@
-am__fastdepCC_FALSE ?= @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE ?= @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE ?= @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE ?= @am__fastdepCXX_TRUE@
-am__include ?= @am__include@
-am__leading_dot ?= @am__leading_dot@
-am__quote ?= @am__quote@
-am__tar ?= @am__tar@
-am__untar ?= @am__untar@
-beepdir ?= @beepdir@
-bindir ?= @bindir@
-build ?= @build@
-build_alias ?= @build_alias@
-build_cpu ?= @build_cpu@
-build_os ?= @build_os@
-build_vendor ?= @build_vendor@
-datadir ?= @datadir@
-datarootdir ?= @datarootdir@
-exec_prefix ?= @exec_prefix@
-host ?= @host@
-host_alias ?= @host_alias@
-host_cpu ?= @host_cpu@
-host_os ?= @host_os@
-host_vendor ?= @host_vendor@
-includedir ?= @includedir@
-infodir ?= @infodir@
-install_sh ?= @install_sh@
-libdir ?= @libdir@
-libexecdir ?= @libexecdir@
-localedir ?= @localedir@
-localstatedir ?= @localstatedir@
-mandir ?= @mandir@
-mkdir_p ?= @mkdir_p@
-oldincludedir ?= @oldincludedir@
-plugindir ?= @plugindir@
-pluginsubs ?= @pluginsubs@
-prefix ?= @prefix@
-program_transform_name ?= @program_transform_name@
-sbindir ?= @sbindir@
-sharedstatedir ?= @sharedstatedir@
-sysconfdir ?= @sysconfdir@
-target ?= @target@
-target_alias ?= @target_alias@
-target_cpu ?= @target_cpu@
-target_os ?= @target_os@
-target_vendor ?= @target_vendor@
-WAV_SNDFILE ?= @WAV_SNDFILE@
-VFS_BACKEND ?= @VFS_BACKEND@
-CURL_CFLAGS ?= @CURL_CFLAGS@
-CURL_LIBS ?= @CURL_LIBS@
-MUSICBRAINZ_LIBS ?= @MUSICBRAINZ_LIBS@
-CHARDET_LIBS ?= @CHARDET_LIBS@
-samplerate_CFLAGS ?= @samplerate_CFLAGS@
-samplerate_LIBS ?= @samplerate_LIBS@
-SUBDIR_GUESS ?= @SUBDIR_GUESS@
-LIBNOTIFY_CFLAGS ?= @LIBNOTIFY_CFLAGS@
-LIBNOTIFY_LIBS ?= @LIBNOTIFY_LIBS@
-XML_CPPFLAGS ?= @XML_CPPFLAGS@
-XML_LIBS ?= @XML_LIBS@
-CONTAINER_PLUGIN_DIR ?= @CONTAINER_PLUGIN_DIR@
-CONTAINER_PLUGINS ?= @CONTAINER_PLUGINS@
-SHARED_SUFFIX ?= @SHARED_SUFFIX@
-PICFLAGS ?= @PICFLAGS@
-PICLDFLAGS ?= @PICLDFLAGS@
-LIBLDFLAGS ?= @LIBLDFLAGS@
-AUDLDFLAGS ?= @AUDLDFLAGS@
-INTL_OBJECTIVE ?= @INTL_OBJECTIVE@
-LIBMCS_CFLAGS ?= @LIBMCS_CFLAGS@
-LIBMCS_LIBS ?= @LIBMCS_LIBS@
-MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
-MOWGLI_LIBS ?= @MOWGLI_LIBS@
-LIBAUDCLIENT_OBJECTIVE ?= @LIBAUDCLIENT_OBJECTIVE@
-TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
-TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
-PCH ?= @PCH@
--- a/skins/Classic/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/skins/Classic/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,25 +1,26 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../buildsys.mk
 
 skindir = $(pkgdatadir)/Skins/Classic
 
-OBJECTIVE_DATA = \
-	balance.png:$(skindir)		\
-	cbuttons.png:$(skindir)		\
-	eq_ex.png:$(skindir)		\
-	eqmain.png:$(skindir)		\
-	main.png:$(skindir)		\
-	monoster.png:$(skindir)		\
-	nums_ex.png:$(skindir)		\
-	playpaus.png:$(skindir)		\
-	pledit.png:$(skindir)		\
-	posbar.png:$(skindir)		\
-	shufrep.png:$(skindir)		\
-	text.png:$(skindir)		\
-	titlebar.png:$(skindir)		\
-	volume.png:$(skindir)		\
-	pledit.txt:$(skindir)		\
-	viscolor.txt:$(skindir)		\
-	skin.hints:$(skindir)
+install-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+	        ${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../../mk/objective.mk
+uninstall-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${skindir}/$$i ]; then \
+			if rm -f ${DESTDIR}${skindir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done
--- a/skins/Default/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/skins/Default/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,25 +1,26 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../buildsys.mk
 
 skindir = $(pkgdatadir)/Skins/Default
 
-OBJECTIVE_DATA = \
-	balance.png:$(skindir)		\
-	cbuttons.png:$(skindir)		\
-	eq_ex.png:$(skindir)		\
-	eqmain.png:$(skindir)		\
-	main.png:$(skindir)		\
-	monoster.png:$(skindir)		\
-	nums_ex.png:$(skindir)		\
-	playpaus.png:$(skindir)		\
-	pledit.png:$(skindir)		\
-	posbar.png:$(skindir)		\
-	shufrep.png:$(skindir)		\
-	text.png:$(skindir)		\
-	titlebar.png:$(skindir)		\
-	volume.png:$(skindir)		\
-	pledit.txt:$(skindir)		\
-	viscolor.txt:$(skindir)		\
-	skin.hints:$(skindir)
+install-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+	        ${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../../mk/objective.mk
+uninstall-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${skindir}/$$i ]; then \
+			if rm -f ${DESTDIR}${skindir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done
--- a/skins/Ivory/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/skins/Ivory/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,24 +1,26 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../buildsys.mk
 
 skindir = $(pkgdatadir)/Skins/Ivory
-OBJECTIVE_DATA = \
-	balance.png:$(skindir)		\
-	cbuttons.png:$(skindir)		\
-	eq_ex.png:$(skindir)		\
-	eqmain.png:$(skindir)		\
-	main.png:$(skindir)		\
-	monoster.png:$(skindir)		\
-	nums_ex.png:$(skindir)		\
-	playpaus.png:$(skindir)		\
-	pledit.png:$(skindir)		\
-	posbar.png:$(skindir)		\
-	shufrep.png:$(skindir)		\
-	text.png:$(skindir)		\
-	titlebar.png:$(skindir)		\
-	volume.png:$(skindir)		\
-	pledit.txt:$(skindir)		\
-	viscolor.txt:$(skindir)		\
-	skin.hints:$(skindir)
+
+install-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+	        ${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../../mk/objective.mk
+uninstall-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${skindir}/$$i ]; then \
+			if rm -f ${DESTDIR}${skindir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done
--- a/skins/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/skins/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,9 +1,4 @@
-.SILENT:
-
-include ../mk/rules.mk
-include ../mk/init.mk
+include ../buildsys.mk
 
 SUBDIRS = Default Classic TinyPlayer Osmosis Ivory
 
-include ../mk/objective.mk
-
--- a/skins/Osmosis/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/skins/Osmosis/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,24 +1,26 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../buildsys.mk
 
 skindir = $(pkgdatadir)/Skins/Osmosis
-OBJECTIVE_DATA = \
-	balance.png:$(skindir)		\
-	cbuttons.png:$(skindir)		\
-	eq_ex.png:$(skindir)		\
-	eqmain.png:$(skindir)		\
-	main.png:$(skindir)		\
-	monoster.png:$(skindir)		\
-	nums_ex.png:$(skindir)		\
-	playpaus.png:$(skindir)		\
-	pledit.png:$(skindir)		\
-	posbar.png:$(skindir)		\
-	shufrep.png:$(skindir)		\
-	text.png:$(skindir)		\
-	titlebar.png:$(skindir)		\
-	volume.png:$(skindir)		\
-	pledit.txt:$(skindir)		\
-	viscolor.txt:$(skindir)		\
-	skin.hints:$(skindir)
+
+install-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+	        ${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../../mk/objective.mk
+uninstall-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${skindir}/$$i ]; then \
+			if rm -f ${DESTDIR}${skindir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done
--- a/skins/TinyPlayer/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/skins/TinyPlayer/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,24 +1,26 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../buildsys.mk
 
 skindir = $(pkgdatadir)/Skins/TinyPlayer
-OBJECTIVE_DATA = \
-	balance.png:$(skindir)		\
-	cbuttons.png:$(skindir)		\
-	eq_ex.png:$(skindir)		\
-	eqmain.png:$(skindir)		\
-	main.png:$(skindir)		\
-	monoster.png:$(skindir)		\
-	nums_ex.png:$(skindir)		\
-	playpaus.png:$(skindir)		\
-	pledit.png:$(skindir)		\
-	posbar.png:$(skindir)		\
-	shufrep.png:$(skindir)		\
-	text.png:$(skindir)		\
-	titlebar.png:$(skindir)		\
-	volume.png:$(skindir)		\
-	pledit.txt:$(skindir)		\
-	viscolor.txt:$(skindir)		\
-	skin.hints:$(skindir)
+
+install-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+	        ${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${skindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${skindir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../../mk/objective.mk
+uninstall-extra:
+	y="*.png *.txt *.hints"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${skindir}/$$i ]; then \
+			if rm -f ${DESTDIR}${skindir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done
--- a/src/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,9 +1,8 @@
 .SILENT:
 
-include ../mk/rules.mk
-include ../mk/init.mk
+include ../extra.mk
 
-SUBDIRS = $(SUBDIR_GUESS)
+SUBDIRS = libguess
 
 ifdef USE_DBUS
 SUBDIRS += libaudclient audtool
@@ -11,9 +10,5 @@
 
 SUBDIRS += audacious libid3tag
 
-include ../mk/objective.mk
+include ../buildsys.mk
 
-ifdef USE_DBUS
-depend-prehook:
-	@cd audacious; $(MAKE) $@ || exit; cd ..;
-endif
--- a/src/audacious/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/audacious/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,39 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-include ../../mk/objective.mk
+include ../../extra.mk
 
 SUBDIRS = $(INTL_OBJECTIVE) glade images ui
 
-OBJECTIVE_BINS = audacious
+PROG = audacious
 
 LDFLAGS += $(AUDLDFLAGS)
 
-LDADD = \
-	$(LIBINTL) \
-	$(samplerate_LIBS) \
-	$(CHARDET_LIBS) \
-	$(GTK_LIBS) \
-	$(DBUS_LIBS) \
-	$(MOWGLI_LIBS) \
-	$(LIBMCS_LIBS) \
-	$(LIBGLADE_LIBS) \
-	$(REGEX_LIBS)
-
-CFLAGS += \
-	$(MOWGLI_CFLAGS) \
-	$(GTK_CFLAGS) \
-	$(LIBGLADE_CFLAGS) \
-	$(BEEP_DEFINES) \
-	$(ARCH_DEFINES) \
-	$(DBUS_CFLAGS) \
-	$(samplerate_CFLAGS) \
-	$(REGEX_CFLAGS) \
-	$(LIBMCS_CFLAGS) \
-	-D_AUDACIOUS_CORE \
-	-I.. -I../.. \
-	-I./intl
-
-HEADERS = \
+INCLUDES = \
 	auddrct.h \
 	configdb.h \
 	custom_uri.h \
@@ -67,7 +40,7 @@
 	vfs_buffered_file.h \
 	xconvert.h
 
-SOURCES = \
+SRCS = \
 	auddrct.c \
 	build_stamp.c \
 	configdb.c \
@@ -147,29 +120,56 @@
 	sync-menu.c \
 	xconvert.c
 
+ifdef USE_DBUS
+SRCS += dbus.c
+endif
+
 LIBDEP = ../libguess/libguess.a
 
-ifdef USE_DBUS
-SOURCES += dbus.c
-CFLAGS += -I../libaudclient
-DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
-OBJECTIVE_LIBS_NOINST += $(DBUS_BINDINGS)
-LIBDEP += ../libaudclient/libaudclient$(SHARED_SUFFIX)
-LDADD += -L../libaudclient -laudclient
-endif
+include ../../buildsys.mk
 
 LIBADD += $(LDADD)
 
-depend-prehook: $(DBUS_BINDINGS)
+depend-hook: $(DBUS_BINDINGS)
+
+CPPFLAGS += -DHAVE_CONFIG_H \
+	$(MOWGLI_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(LIBGLADE_CFLAGS) \
+	$(BEEP_DEFINES) \
+	$(ARCH_DEFINES) \
+	$(DBUS_CFLAGS) \
+	$(samplerate_CFLAGS) \
+	$(REGEX_CFLAGS) \
+	$(LIBMCS_CFLAGS) \
+	-D_AUDACIOUS_CORE \
+	-I.. -I../.. \
+	-I./intl
+
+LIBS += \
+	$(LIBINTL) \
+	$(samplerate_LIBS) \
+	../libguess/libguess.a \
+	$(GTK_LIBS) \
+	$(DBUS_LIBS) \
+	$(MOWGLI_LIBS) \
+	$(LIBMCS_LIBS) \
+	$(LIBGLADE_LIBS) \
+	$(REGEX_LIBS)
+
+ifdef USE_DBUS	
+CPPFLAGS += -I../libaudclient
+DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
+LIBS += -L../libaudclient -laudclient
+endif
 
 build_stamp.c: 
 	if [ -d ../../.hg ]; then \
 		revh=`hg tip --template 'const char *svn_stamp = "#rev#:#node|short#";\n' 2>/dev/null`; \
 		[ -z "$$revh" ] || echo "$$revh" > build_stamp.c; \
-		printf "%10s     %-20s\n" STAMP "build_stamp.c"; \
 	fi
 
-clean-prehook:
+clean-hook:
 	if [ -d ../../.hg ]; then \
 		rm -f build_stamp.c; \
 	fi
@@ -180,17 +180,9 @@
 	mpris_tracklist.xml \
 	mpris_player.xml
 
-OBJECTS = ${SOURCES:.c=.o}
-
 desktop_DATA = audacious.desktop
 desktopdir = $(datadir)/applications
 
-build-prehook: $(PCH)
-
-audacious: $(OBJECTS) $(LIBDEP)
-	$(CXX) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
-	@printf "%10s     %-20s\n" LINK $@
-
 dbus-server-bindings.h: $(DBUS_BINDINGS_SOURCES)
 	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=audacious_rc objects.xml > $@
 	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@
--- a/src/audacious/glade/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/audacious/glade/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,10 +1,27 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../../buildsys.mk
 
 gladexmldir = $(pkgdatadir)/glade
 
-OBJECTIVE_DATA = \
-	fileinfo.glade:$(gladexmldir) \
-	prefswin.glade:$(gladexmldir)
+install-extra:
+	y="fileinfo.glade prefswin.glade"; \
+	for i in $$y; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${gladexmldir} && ${INSTALL} -m 644 $$i ${DESTDIR}${gladexmldir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../../../mk/objective.mk
+uninstall-extra:
+	y="fileinfo.glade prefswin.glade"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${gladexmldir}/$$i ]; then \
+			if rm -f ${DESTDIR}${gladexmldir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done;
+
--- a/src/audacious/images/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/audacious/images/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,17 +1,27 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../../buildsys.mk
 
 imagesdir = $(pkgdatadir)/images
 
-OBJECTIVE_DATA = \
-	about-logo.png:$(imagesdir) \
-	audacious_player.xpm:$(imagesdir) \
-	appearance.png:$(imagesdir) \
-	audio.png:$(imagesdir) \
-	connectivity.png:$(imagesdir) \
-	mouse.png:$(imagesdir) \
-	playlist.png:$(imagesdir) \
-	plugins.png:$(imagesdir) \
-	eq.png:$(imagesdir)
+install-extra:
+	y="*.png *.xpm"; \
+	for i in $$y; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${imagesdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${imagesdir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../../../mk/objective.mk
+uninstall-extra:
+	y="*.png *.xpm"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${imagesdir}/$$i ]; then \
+			if rm -f ${DESTDIR}${imagesdir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done;
+
--- a/src/audacious/intl/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/audacious/intl/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,22 +1,4 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir)
-
-OBJECTIVE_LIBS_NOINST = libintl.a
-
-DEFS += -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
-	-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
-	-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DINSTALLPREFIX=\"$(libdir)\" -DNO_XMALLOC \
-	-Dset_relocation_prefix=libintl_set_relocation_prefix \
-	-Drelocate=libintl_relocate \
-	-DDEPENDS_ON_LIBICONV=1
-
-CFLAGS += $(PICFLAGS) -I../../.. -I../.. -I. $(DEFS)
-
-SOURCES = \
+SRCS = \
   bindtextdom.c \
   dcgettext.c \
   dgettext.c \
@@ -41,6 +23,20 @@
   os2compat.c \
   intl-compat.c  
 
-OBJECTS = ${SOURCES:.c=.o}
+STATIC_LIB_NOINST = libintl.a
+
+include ../../../buildsys.mk
+include ../../../extra.mk
+
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/intl
+aliaspath = $(localedir)
 
-include ../../../mk/objective.mk
+DEFS += -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+	-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
+	-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DINSTALLPREFIX=\"$(libdir)\" -DNO_XMALLOC \
+	-Dset_relocation_prefix=libintl_set_relocation_prefix \
+	-Drelocate=libintl_relocate \
+	-DDEPENDS_ON_LIBICONV=1
+
+CPPFLAGS += -I../../.. -I../.. -I. $(DEFS)
--- a/src/audacious/ui/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/audacious/ui/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,12 +1,27 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../../buildsys.mk
 
 gladexmldir = $(pkgdatadir)/ui
 
-OBJECTIVE_DATA = \
-	carbon-menubar.ui:$(gladexmldir) \
-	mainwin.ui:$(gladexmldir) \
-	playlist.ui:$(gladexmldir) \
-	equalizer.ui:$(gladexmldir)
+install-extra:
+	y="*.ui"; \
+	for i in $$y; do \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${gladexmldir} && ${INSTALL} -m 644 $$i ${DESTDIR}${gladexmldir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi; \
+	done
 
-include ../../../mk/objective.mk
+uninstall-extra:
+	y="*.ui"; \
+	for i in $$y; do \
+		if [ -f ${DESTDIR}${gladexmldir}/$$i ]; then \
+			if rm -f ${DESTDIR}${gladexmldir}/$$i; then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi; \
+	done;
+
--- a/src/audtool/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/audtool/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,11 +1,19 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-include ../../mk/objective.mk
+include ../../extra.mk
+
+PROG = audtool
 
-OBJECTIVE_BINS = audtool
+SRCS =	 			\
+	audtool_main.c			\
+	audtool_handlers_general.c	\
+	audtool_handlers_playback.c	\
+	audtool_handlers_playlist.c	\
+	audtool_handlers_playqueue.c	\
+	audtool_handlers_vitals.c	\
+	audtool_report.c
 
-LDFLAGS += $(AUDLDFLAGS)
-LDADD = \
+include ../../buildsys.mk
+
+LIBS += \
 	$(DBUS_LIBS) \
 	-L../libaudclient -laudclient \
 	$(GTK_LIBS)      \
@@ -22,17 +30,4 @@
 	-I.. -I../..   \
 	-I../intl
 
-SOURCES =	 			\
-	audtool_main.c			\
-	audtool_handlers_general.c	\
-	audtool_handlers_playback.c	\
-	audtool_handlers_playlist.c	\
-	audtool_handlers_playqueue.c	\
-	audtool_handlers_vitals.c	\
-	audtool_report.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-audtool: $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
-	@printf "%10s     %-20s\n" LINK $@
+CPPFLAGS += $(CFLAGS)
--- a/src/libaudclient/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/libaudclient/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,20 +1,26 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-PICLDFLAGS = $(LIBLDFLAGS)
+LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}
+LIB_MAJOR = 1
+LIB_MINOR = 0
+
+SRCS = audctrl.c
 
-OBJECTIVE_LIBS = libaudclient$(SHARED_SUFFIX)
-OBJECTIVE_SONAME_SUFFIX = 1
-LIBAUDACIOUS_SUFFIX = 1.0.0
+INCLUDES = audctrl.h
+
+include ../../buildsys.mk
 
-LIBADD = \
-	$(GTK_LIBS) \
+depend-hook:
+	cd ../audacious; make dbus-client-bindings.h
+
+LIBS += \
+	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(MOWGLI_LIBS) \
 	$(GCONF_LIBS) \
 	$(LIBMCS_LIBS)
 
-CFLAGS += $(PICFLAGS) \
+CFLAGS += $(LIB_CFLAGS) \
 	$(MOWGLI_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -24,19 +30,4 @@
 	-I.. -I../.. \
 	-I../intl
 
-SOURCES = \
-	audctrl.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-HEADERS = \
-	audctrl.h
-
-include ../../mk/objective.mk
-
-install-posthook:
-	@mv ${DESTDIR}/${LIBDIR}/libaudclient$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudclient$(SHARED_SUFFIX).$(LIBAUDACIOUS_SUFFIX)
-	@ln -sf libaudclient$(SHARED_SUFFIX).$(LIBAUDACIOUS_SUFFIX) \
-		${DESTDIR}/${LIBDIR}/libaudclient$(SHARED_SUFFIX).1
-	@ln -sf libaudclient$(SHARED_SUFFIX).1 \
-		${DESTDIR}/${LIBDIR}/libaudclient$(SHARED_SUFFIX)
+CPPFLAGS = ${CFLAGS}
--- a/src/libguess/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/libguess/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,14 +1,6 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS_NOINST = libguess.a
-OBJECTIVE_SONAME_SUFFIX = 0.2.0
+STATIC_LIB_NOINST = libguess.a
 
-LDFLAGS += -Wl,-export-dynamic
-
-CFLAGS += $(PICFLAGS)
-
-SOURCES = \
+SRCS = \
 	guess.c \
 	arabic_impl.c \
 	cjk_impl.c \
@@ -17,6 +9,4 @@
 	russian_impl.c \
 	turkish_impl.c
 
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../mk/objective.mk
+include ../../buildsys.mk
--- a/src/libid3tag/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/libid3tag/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,21 +1,10 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libaudid3tag$(SHARED_SUFFIX)
-
-PICLDFLAGS = $(LIBLDFLAGS)
-
-LIBDIR = $(plugindir)
+LIB = ${LIB_PREFIX}audid3tag${LIB_SUFFIX}
 
-LIBADD += $(GLIB_LIBS)
+INCLUDES = id3tag.h
 
-CFLAGS += $(PICFLAGS) \
-	-I.. \
-	$(GLIB_CFLAGS) -Wall
-
-HEADERS = id3tag.h
-
-SOURCES = \
+SRCS = \
 	compat.c \
 	debug.c \
 	file.c \
@@ -34,6 +23,11 @@
 	utf16.c \
 	util.c
 
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
 
-include ../../mk/objective.mk
+CPPFLAGS += -I.. $(GLIB_CFLAGS)
+CFLAGS += $(LIB_CFLAGS)
+
+LIBS += $(GLIB_LIBS)
+
+LIBDIR = $(plugindir)