# HG changeset patch
# User yaz
# Date 1158595191 25200
# Node ID b223a90f8a9aab4cac2bf80b1c9bbee3d399e856
# Parent  33ed88fef9f5bae40a9d834c57fbad107569e8dc
[svn] - build fixes.

diff -r 33ed88fef9f5 -r b223a90f8a9a ChangeLog
--- a/ChangeLog	Mon Sep 18 08:54:41 2006 -0700
+++ b/ChangeLog	Mon Sep 18 08:59:51 2006 -0700
@@ -1,3 +1,11 @@
+2006-09-18 15:54:41 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [70]
+  Let us not go crazy with the ../ there, your includes are not *that* far away, hmmkay?
+
+  Changes:        Modified:
+  +3 -3           trunk/src/adplug/core/Makefile  
+
+
 2006-09-18 15:47:33 +0000  Jonathan Schleifer <js@h3c.de>
   revision [68]
   #include "audacious/util.h"? WTF? Fixed.
diff -r 33ed88fef9f5 -r b223a90f8a9a configure.ac
--- a/configure.ac	Mon Sep 18 08:54:41 2006 -0700
+++ b/configure.ac	Mon Sep 18 08:59:51 2006 -0700
@@ -872,7 +872,6 @@
 AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes")
 
 CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS"
-LDFLAGS="$LDFLAGS $AUDACIOUS_LIBS"
 
 AC_MSG_CHECKING(if __ELF__ is defined)
 AC_EGREP_CPP(yes,
diff -r 33ed88fef9f5 -r b223a90f8a9a src/alsa/init.c
--- a/src/alsa/init.c	Mon Sep 18 08:54:41 2006 -0700
+++ b/src/alsa/init.c	Mon Sep 18 08:59:51 2006 -0700
@@ -16,6 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
+#include <glib.h>
 #include "audacious/main.h"
 #include "alsa.h"
 #include <dlfcn.h>
diff -r 33ed88fef9f5 -r b223a90f8a9a src/scrobbler/config.h
--- a/src/scrobbler/config.h	Mon Sep 18 08:54:41 2006 -0700
+++ b/src/scrobbler/config.h	Mon Sep 18 08:59:51 2006 -0700
@@ -1,4 +1,4 @@
-#include "../../../config.h"
+#include "../../config.h"
 
 #ifndef __SCROBBLER_CONFIG_H__
 #define __SCROBBLER_CONFIG_H__