aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/audacious/files/patch-src-audacious-Makefile
blob: 1cf90f3898ed337a0b09d935f1fca03d1e8c26fd (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
--- src/audacious/Makefile.orig 2011-04-16 18:09:10.000000000 +0200
+++ src/audacious/Makefile  2011-04-25 11:44:28.000000000 +0200
@@ -93,15 +93,16 @@
 include ../../buildsys.mk
 
 ifeq ($(USE_DBUS),yes)
-CPPFLAGS += -I../libaudclient
+CPPFLAGS = -I../libaudclient
 DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
-LIBS += -L../libaudclient -laudclient
+LIBS = -L../libaudclient -laudclient
 endif
 
 pre-depend: ${DBUS_BINDINGS}
 
 CPPFLAGS += -std=gnu99 \
             -DHAVE_CONFIG_H \
+       -I.. -I../..            \
        ${MOWGLI_CFLAGS}        \
        ${GLIB_CFLAGS}          \
        ${GTHREAD_CFLAGS}       \
@@ -118,7 +119,7 @@
        ${LIBGUESS_CFLAGS}      \
        -I.. -I../..
 
-LIBS += ${LDADD}                       \
+LIBS +=                    \
         -lm \
        -L../libaudcore -laudcore   \
        -L../libaudgui -laudgui \
@@ -133,7 +134,8 @@
        ${LIBMCS_LIBS}                  \
        ${REGEX_LIBS}                   \
        ${PTHREAD_LIBS}                 \
-       ${LIBGUESS_LIBS}
+       ${LIBGUESS_LIBS}                \
+       ${LDADD}
 
 LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}