--- src/audacious/Makefile.orig	2008-05-24 00:00:34.000000000 +0200
+++ src/audacious/Makefile	2008-05-28 19:12:10.000000000 +0200
@@ -150,15 +150,8 @@
 
 include ../../buildsys.mk
 
-ifeq ($(USE_DBUS),yes)
-CPPFLAGS += -I../libaudclient
-DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
-LIBS += -L../libaudclient -laudclient
-endif
-
-pre-depend: ${DBUS_BINDINGS}
-
-CPPFLAGS += -DHAVE_CONFIG_H		\
+CPPFLAGS = -I.. -I../..			\
+		-DHAVE_CONFIG_H			\
 		${MOWGLI_CFLAGS}		\
 		${GLIB_CFLAGS}			\
 		${GTHREAD_CFLAGS}		\
@@ -173,10 +166,9 @@
 		-D_AUDACIOUS_CORE		\
 		-I../libSAD				\
 		${EGGSM_CFLAGS}			\
-		-I.. -I../..			\
 		-I./intl
 
-LIBS += ${LDADD}						\
+LIBS = ${LDADD}						\
 		${LIBINTL}						\
 		${SAMPLERATE_LIBS}				\
 		../libguess/libguess.a			\
@@ -190,6 +182,14 @@
 		${LIBMCS_LIBS}					\
 		${REGEX_LIBS}
 
+ifeq ($(USE_DBUS),yes)
+CPPFLAGS += -I../libaudclient
+DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
+LIBS += -L../libaudclient -laudclient
+endif
+
+pre-depend: ${DBUS_BINDINGS}
+
 LDFLAGS += ${PROG_IMPLIB_LDFLAGS}
 
 build_stamp.c: 
