changeset 2974:d116c0d61dd2

follow core changes.

--- a/buildsys.mk.in	Wed Nov 26 03:13:39 2008 +0900
+++ b/buildsys.mk.in	Wed Nov 26 05:17:55 2008 +0900
@@ -62,8 +62,8 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
-libdir = @libdir@
-plugindir ?= ${libdir}/${PACKAGE}
+libdir = @libdir@/${PACKAGE}
+plugindir ?= ${libdir}
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@
@@ -81,7 +81,8 @@
 OBJS += ${OBJS7:.xpm=.o}
 
 .SILENT:
-.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .py .pyc .xpm
+.SUFFIXES:
+.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .o .py .pyc .xpm
 .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean
 
 all:
@@ -122,8 +123,8 @@
 	done; \
 	if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
 		${DEPEND_STATUS}; \
-		rm -f .deps; \
 		if ${MAKE} ${MFLAGS} $$deps; then \
+			rm -f .deps; \
 			cat $$deps >.deps; \
 			rm -f $$deps; \
 			${DEPEND_OK}; \
@@ -397,7 +398,7 @@
 		${MAKE} ${MFLAGS} clean || exit 1; \
 		${DIR_LEAVE}; \
 	done
-	
+
 	for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} .deps ${DEPS}; do \
 		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \
@@ -414,7 +415,7 @@
 		${MAKE} ${MFLAGS} distclean || exit 1; \
 		${DIR_LEAVE}; \
 	done
-	
+
 	for i in ${PROG} ${PROG_NOINST} ${LIB} ${LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${DISTCLEAN} *~; do \
 		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \

--- a/configure.ac	Wed Nov 26 03:13:39 2008 +0900
+++ b/configure.ac	Wed Nov 26 05:17:55 2008 +0900
@@ -219,14 +219,12 @@
 		PICFLAGS="-fPIC -DPIC"
 		PICLDFLAGS="-fPIC -DPIC -shared"
 		LIBLDFLAGS="-fPIC -DPIC -shared"
-		AUDLDFLAGS="-L \${libdir} -Wl,-export-dynamic -Wl,-rpath,${libdir}"
 		SHARED_SUFFIX=".so"
 		;;
 esac
 AC_SUBST(PICFLAGS)
 AC_SUBST(PICLDFLAGS)
 AC_SUBST(LIBLDFLAGS)
-AC_SUBST(AUDLDFLAGS)
 AC_SUBST(SHARED_SUFFIX)
 AC_DEFINE_UNQUOTED(SHARED_SUFFIX, "${SHARED_SUFFIX}",
 	[Define the shared module suffix extension on your platform.])
@@ -1614,6 +1612,8 @@
 
 plugindir=`pkg-config audlegacy --variable=plugin_dir`
 AC_SUBST(plugindir)
+AUDLDFLAGS="-L ${plugindir} -Wl,-export-dynamic -Wl,-rpath,${plugindir}"
+AC_SUBST(AUDLDFLAGS)
 
 dnl XXX
 

--- a/extra.mk.in	Wed Nov 26 03:13:39 2008 +0900
+++ b/extra.mk.in	Wed Nov 26 05:17:55 2008 +0900
@@ -312,7 +312,7 @@
 includedir ?= @includedir@
 infodir ?= @infodir@
 install_sh ?= @install_sh@
-libdir ?= @libdir@
+libdir ?= @plugindir@
 libexecdir ?= @libexecdir@
 localedir ?= @localedir@
 localstatedir ?= @localstatedir@

--- a/src/adplug/adplug-xmms.cc	Wed Nov 26 03:13:39 2008 +0900
+++ b/src/adplug/adplug-xmms.cc	Wed Nov 26 05:17:55 2008 +0900
@@ -29,11 +29,11 @@
 #include "emuopl.h"
 #include "silentopl.h"
 #include "players.h"
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 extern "C"
 {
-#include <audacious/plugin.h>
-#include <audacious/output.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
 }