diff options
| author | Colin Guthrie <colin@mageia.org> | 2011-06-22 14:07:15 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-06-22 14:07:15 +0100 |
| commit | a1f80d4274e72494d9f67b01e7d63f08c3e6a16e (patch) | |
| tree | 0977a4d9ded6d67db9b2c39679158e46c1bae81e /src | |
| parent | 42bcb418aed1ab94c56c09a6b31bac05c08ac04a (diff) | |
| parent | f36ac546e6a70cc1bb4736f0b104d0dd13b12500 (diff) | |
Merge remote-tracking branch 'mkbosmans/merge/build-sys'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4990ac35..b76cb400 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -998,8 +998,13 @@ libprotocol_http_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_http_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h +libprotocol_native_la_CFLAGS = $(AM_CFLAGS) libprotocol_native_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_native_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la +if HAVE_DBUS +libprotocol_native_la_CFLAGS += $(DBUS_CFLAGS) +libprotocol_native_la_LIBADD += $(DBUS_LIBS) +endif libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h libprotocol_esound_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version |