mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
Merge commit 'coling/master'
This commit is contained in:
commit
116b38c972
1 changed files with 2 additions and 2 deletions
|
|
@ -1315,7 +1315,7 @@ endif
|
||||||
|
|
||||||
if HAVE_DBUS
|
if HAVE_DBUS
|
||||||
libalsa_util_la_SOURCES += modules/reserve.h modules/reserve.c modules/reserve-wrap.c modules/reserve-wrap.h
|
libalsa_util_la_SOURCES += modules/reserve.h modules/reserve.c modules/reserve-wrap.c modules/reserve-wrap.h
|
||||||
libalsa_util_la_LIBADD += $(DBUS_LIBS)
|
libalsa_util_la_LIBADD += $(DBUS_LIBS) libdbus-util.la
|
||||||
libalsa_util_la_CFLAGS += $(DBUS_CFLAGS)
|
libalsa_util_la_CFLAGS += $(DBUS_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
@ -1532,7 +1532,7 @@ libbluetooth_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
|
||||||
|
|
||||||
module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c modules/bluetooth/rtp.h
|
module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c modules/bluetooth/rtp.h
|
||||||
module_bluetooth_device_la_LDFLAGS = $(MODULE_LDFLAGS)
|
module_bluetooth_device_la_LDFLAGS = $(MODULE_LDFLAGS)
|
||||||
module_bluetooth_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libdbus-util.la libbluetooth-ipc.la libbluetooth-sbc.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
|
module_bluetooth_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libdbus-util.la libbluetooth-util.la libbluetooth-ipc.la libbluetooth-sbc.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
|
||||||
module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
|
module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
|
||||||
|
|
||||||
# Apple Airtunes/RAOP
|
# Apple Airtunes/RAOP
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue