[pulseaudio-discuss] [PATCH 20/56] build: Compile module-bluetooth-policy with BlueZ 5 as well

[jprvita at gmail.com]

From: João Paulo Rechi Vita <jprvita at openbossa.org>

module-bluetooth-policy doesn't use nothing BlueZ 4 specific, so it can
be used with BlueZ 5 as well.
---
 src/Makefile.am | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 82fe184..733c338 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1332,6 +1332,7 @@ endif
 
 if HAVE_BLUEZ_5
 modlibexec_LTLIBRARIES += \
+		module-bluetooth-policy.la \
 		module-bluez5-discover.la
 endif
 
@@ -2022,6 +2023,12 @@ proximity_helper_LDADD = $(AM_LDADD) $(BLUEZ_4_LIBS)
 proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_4_CFLAGS)
 proximity_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
+# Bluetooth policy
+module_bluetooth_policy_la_SOURCES = modules/bluetooth/module-bluetooth-policy.c
+module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_bluetooth_policy_la_LIBADD = $(MODULE_LIBADD)
+module_bluetooth_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+
 # Bluetooth BlueZ 4 sink / source
 module_bluez4_discover_la_SOURCES = modules/bluetooth/module-bluez4-discover.c
 module_bluez4_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -2041,11 +2048,6 @@ module_bluez4_device_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_bluez4_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SBC_LIBS) libbluez4-util.la
 module_bluez4_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS)
 
-module_bluetooth_policy_la_SOURCES = modules/bluetooth/module-bluetooth-policy.c
-module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_bluetooth_policy_la_LIBADD = $(MODULE_LIBADD)
-module_bluetooth_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-
 # Bluetooth BlueZ 5 sink / source
 module_bluez5_discover_la_SOURCES = modules/bluetooth/module-bluez5-discover.c
 module_bluez5_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
-- 
1.7.11.7