Merge lp:~bluetooth/bluez/bluez5-upgrade into lp:~bluetooth/bluez/vivid-phone-overlay

[Simon Fels]

* New upstream release.
* Merge with wily to get back in sync
* debian/libbluetooth3.symbols:
  - Update to refelect symbols added in 5.33
* debian/rules:
  - Install additional tools/tests during dh_install which bluez
    doesn't install on its own.
  - Enable ebook support for PBAP
* debian/control:
  - Add dependency to libebook for bluez-obexd
* debian/patches/0001-core-add-startup-option-to-provide-different-configu.patch:
  - On Touch we need a way to configure another configuration file on
    startup than using the one provided with the package
* debian/patches/0002-Import-ebook-support-for-PBAP.patch:
  - Import missing source file from upstream not included in release
    tarballs
* debian/patches/0003-obexd-enable-ebook-backend-conditionally.patch:
  - The ebook based backend for PBAP support was never build until now
    as the build configuration didn't included it
* debian/patches/0004-obexd-plugins-port-ebook-support-to-the-latest-EDS.patch:
  - Sync ebook implementation with the layout of our EDS storage in Ubuntu
* debian/patches/0001-hostname-handle-chassis-type-handset.patch:
  - Extend hostname chassis handling to also respect chassis type handset
* debian/patches/0001-obexd-pbap-add-headers-correctly-for-size-query.patch
  - Fix indefinite loop in PBAP implementation

[lp:~bluetooth/bluez/bluez5-upgrade]

7. By Simon Fels on 2015-09-16

* debian/patches/0001-obexd-enable-ebook-backend-conditionally.patch:
  - The ebook based backend for PBAP support was never build until now
    as the build configuration didn't included oit
* debian/patches/0002-core-add-startup-option-to-provide-different-configu.patch:
  - On Touch we need a way to configure another configuration file on
    startup than using the one provided with the package
  debian/patches/0003-obexd-plugins-port-ebook-support-to-the-latest-EDS.patch:
  - Sync ebook implementation with the layout of our EDS storage in Ubuntu

8. By Simon Fels on 2015-09-16

Fix changelog and add patches this time really

9. By Simon Fels on 2015-09-16

* debian/patches/0001-core-add-startup-option-to-provide-different-configu.patch:
* debian/patches/0002-Import-ebook-support-for-PBAP.patch:
  - Import missing source file from upstream not included in release
    tarballs
* debian/patches/0003-obexd-enable-ebook-backend-conditionally.patch:
  - The ebook based backend for PBAP support was never build until now
    as the build configuration didn't included it
* debian/patches/0004-obexd-plugins-port-ebook-support-to-the-latest-EDS.patch:

10. By Simon Fels on 2015-09-16

Fix up patch series file

11. By Simon Fels on 2015-09-16

  - Enable ebook support for PBAP
* debian/control:
  - Add dependency to libebook for bluez-obexd

12. By Simon Fels on 2015-09-25

* debian/bluez.bluetooth.upstart:
  - Enable experimental features on startup

13. By Simon Fels on 2015-10-06

Drop patch to provide a different config file on startup

14. By Simon Fels on 2015-10-06

Upgrade to upstream release 5.35

15. By Simon Fels on 2015-10-07

* debian/patches/0001-plugins-add-ubuntu-platform-plugin.patch
  - Add Ubuntu platform plugin to select correct device class on startup
    base on form factor.

16. By Simon Fels on 2015-10-09

Upgrade Ubuntu platform plugin to read form factor from the right place

17. By Simon Fels on 2015-10-12

Drop ubuntu platform plugin and extend hostname handling instead

18. By Simon Fels on 2015-10-12

debian/patches/0001-hostname-handle-chassis-type-handset.patch:
  Extend hostname chassis handling to also respect chassis type handset

19. By Simon Fels on 2015-10-12

Add missing patch

20. By Simon Fels on 2015-10-12

Introduce new package bluez-tests which replaces bluez-test-scripts

21. By Simon Fels on 2015-10-12

Add Replaces/Conflicts for bluez-tests package

22. By Simon Fels on 2015-10-16

Add patches to expose all profiles a device is currently connected to

23. By Simon Fels on 2015-10-19

* debian/patches/0001-obexd-pbap-add-headers-correctly-for-size-query.patch
  - Fix indefinite loop in PBAP implementation

24. By Simon Fels on 2015-10-19

* debian/patches/0001-obexd-pbap-add-headers-correctly-for-size-query.patch:
* 0001-tools-mpris-proxy-allow-user-to-specify-different-mp.patch:
  - Allow us to change the MPRIS service name on startup of the MRPSI proxy

25. By Simon Fels on 2015-10-23

Add missing return statement

=== removed directory '.pc'
=== removed file '.pc/.quilt_patches'
--- .pc/.quilt_patches	2015-09-11 09:01:46 +0000
+++ .pc/.quilt_patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/patches
 
=== removed file '.pc/.quilt_series'
--- .pc/.quilt_series	2015-09-11 09:01:46 +0000
+++ .pc/.quilt_series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-series
 
=== removed file '.pc/.version'
--- .pc/.version	2015-09-11 09:01:46 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 
=== modified file 'AUTHORS'
--- AUTHORS	2015-09-11 09:01:46 +0000
+++ AUTHORS	2015-10-23 13:12:23 +0000
@@ -59,3 +59,43 @@
 Lucas De Marchi <[e-mail]>
 Szymon Janc <[e-mail]>
 Syam Sidhardhan <[e-mail]>
+Paulo Alcantara <[e-mail]>
+Jefferson Delfes <[e-mail]>
+Andrzej Kaczmarek <[e-mail]>
+Eder Ruiz Maria <[e-mail]>
+Mikel Astiz <[e-mail]>
+Chan-yeol Park <[e-mail]>
+João Paulo Rechi Vita <[e-mail]>
+Larry Junior <[e-mail]>
+Raymond Liu <[e-mail]>
+Radoslaw Jablonski <[e-mail]>
+Rafal Michalski <[e-mail]>
+Dmitriy Paliy <[e-mail]>
+Bartosz Szatkowski <[e-mail]>
+Lukasz Pawlik <[e-mail]>
+Slawomir Bochenski <[e-mail]>
+Wayne Lee <[e-mail]>
+Ricky Yuen <[e-mail]>
+Takashi Sasai <[e-mail]>
+Andre Dieb Martins <[e-mail]>
+Cristian Rodríguez <[e-mail]>
+Alex Deymo <[e-mail]>
+Petri Gynther <[e-mail]>
+Scott James Remnant <[e-mail]>
+Jakub Tyszkowski <[e-mail]>
+Grzegorz Kołodziejczyk <[e-mail]>
+Marcin Krąglak <[e-mail]>
+Łukasz Rymanowski <[e-mail]>
+Jerzy Kasenberg <[e-mail]>
+Arman Uguray <[e-mail]>
+Artem Rakhov <[e-mail]>
+Mike Ryan <[e-mail]>
+David Herrmann <[e-mail]>
+Jacob Siverskog <[e-mail]>
+Sebastian Chłąd <[e-mail]>
+Alex Gal <[e-mail]>
+Loic Poulain <[e-mail]>
+Gowtham Anandha Babu <[e-mail]>
+Bharat Panda <[e-mail]>
+Marie Janssen <[e-mail]>
+Jaganath Kanakkassery <[e-mail]>
 
=== modified file 'ChangeLog'
--- ChangeLog	2015-09-11 09:01:46 +0000
+++ ChangeLog	2015-10-23 13:12:23 +0000
@@ -1,3 +1,371 @@
+ver 5.35:
+	Fix issue with connected devices after discovery.
+	Fix issue with profile support and LTK loading.
+	Fix issue with AVRCP events for volume control.
+	Fix issue with OBEX session owner handling.
+	Fix issue with HID over GATT setup failures.
+	Fix issue with GATT notification registration.
+	Fix issue with GATT cache validation feature.
+	Add support for persistent GATT database.
+	Add support for controller enabling option.
+
+ver 5.34:
+	Fix issue with GATT profiles and auto-connect.
+	Fix issue with missing GoepL2CapPsm SDP data.
+	Fix issue with suspending AVDTP endpoints.
+	Fix issue with audio service state on disconnect.
+	Add support for AVRCP Set Addressed Player feature.
+	Add support for AVRCP Get Folder Items feature.
+	Add support for Android 5.1 HFP WBS callbacks.
+
+ver 5.33:
+	Fix issue with memory leak in GATT database.
+	Fix issue with AVDTP set configuration handling.
+	Fix issue with AVDTP discover procedure.
+	Fix issue with not emitting Paired property.
+
+ver 5.32:
+	Fix issue with OPP GET request path handling.
+	Fix issue with ATT information request errors.
+	Fix issue with advertising instance numbers.
+	Fix issue with overwriting SDP record cache.
+	Fix issue with new connections during disconnect.
+	Add support for GATT security auto-elevation.
+
+ver 5.31:
+	Fix issue with crash in networking interface.
+	Fix issue with crash when creating endless GATT loops.
+	Fix issue with memory leak when connecting services.
+	Fix issue with memory leak creating new D-Bus proxy.
+	Fix issue with profile connections from remote devices.
+	Fix issue with GATT over BR/EDR and MTU notification.
+	Fix issue with HID and dual mode remote devices.
+	Fix issue with handling A2DP vendor codec setup.
+	Fix issue with AVRCP and syncing player state.
+	Fix issue with GATT secondary discovery handling.
+	Fix issue with wrong characteristic allocation.
+	Add support for handling BNEP setup response.
+	Add support for setting GATT database security flags.
+	Add support for setting discovery filters interface.
+	Add support for user controlled advertising interface.
+	Update Android qualification documentation to PTS 6.1 release.
+
+ver 5.30:
+	Fix compilation error in C++ due to inline function.
+	Fix issue with missing storage of device information.
+	Fix issue with GATT client and gaps in service handles.
+	Fix issue with AVDTP discovery callback crashing.
+	Fix issue with AVCTP channel handling in case of conflicts.
+	Fix issue with AVRCP target and get capabilities command.
+	Add experimental support for LE advertising manager API.
+	Add support for Android 5.1 GATT MTU exchange API.
+
+ver 5.29:
+	Fix issue with AVCTP initial key repeat timeout.
+	Fix issue with Android application disconnect handling.
+	Fix issue with Android support and service notifications.
+	Fix issue with Android support and Exchange MTU Request.
+	Fix issue with Android HFP support and AT+CMER handling.
+	Fix issue with Android HFP support and SLC setup.
+	Fix issue with Android HFP support and call hold status.
+	Fix issue with Android HFP support and indicator handling.
+	Fix issue with Android HFP support and SCO/eSCO disconnection.
+	Fix issue with Android HID over GATT support and battery service.
+	Fix issue with GATT sending Exchange MTU Request for BR/EDR.
+	Fix issue with GATT notification support without CCC.
+	Fix issue with GATT object life-time after disconnects.
+	Fix issue with GATT notification handling API.
+	Add experimental support for GATT client D-Bus API.
+	Add experimental support for GATT server D-Bus API.
+	Add support for Multi Profile Specification.
+	Update Android qualification documentation to PTS 6.0 release.
+
+ver 5.28:
+	Fix issue with GATT device discovery and probing.
+	Fix issue with bearer selection for dual-mode devices.
+	Fix issue with device removal while connected.
+	Fix issue with device name setting from inquiry response.
+	Fix issue with missing termination of name characteristic.
+	Fix issue with UTF-8 length handling for device name.
+	Fix issue with AVCTP key auto release handling.
+	Fix issue with AVCTP key press repetition handling.
+	Fix issue with payload sizes and GATT notifications.
+	Fix issue with memory corruption and GATT notifications.
+	Add support for HID proxy switching and CSR 8510 A10 devices.
+	Add support for Broadcom hex2hcd conversion utility.
+
+ver 5.27:
+	Fix issue with endian handling and management interface.
+	Fix issue with pending GATT operations when disconnecting.
+	Fix issue with 128-bit UUID conversions for HID over GATT.
+	Add support for Android 5.0 SELinux policies.
+
+ver 5.26:
+	Fix issue with handling A2DP XCASE connection state.
+	Fix issue with crash and A2DP configuration failures.
+	Fix issue with crash during OBEX session shutdown.
+	Add support for version 1.2 of Phonebook Access Profile.
+	Add support for HID over GATT get and set report handling.
+	Add support for Low Energy Secure Connections feature.
+	Add support for Bluetooth 4.2 commands and events.
+	Add support for Android 5.0 Bluetooth features.
+
+ver 5.25:
+	Fix issue with SCO connection after codec negotiation.
+	Fix issue with GATT and secondary service discovery.
+	Fix issue with GATT write descriptor callback.
+	Fix issue with MAP supported features bits.
+	Add support for MAP local time and timezone offset.
+	Add support for PBAP speed-dial and favorites folders.
+	Add support for PBAP speed-dial and identifier filters.
+	Add support for controller mode configuration option.
+	Add initial support for Android Lollipop features.
+
+ver 5.24:
+	Fix issue with storing of connection parameters.
+	Add support for Phonebook Access Profile 1.2 features.
+	Add support for Message Access Profile 1.2 event reports.
+	Add support for Android Bluetooth configuration options.
+
+ver 5.23:
+	Fix issue with concurrent authorization requests.
+	Fix issue with HID report identifier mismatch.
+	Fix issue with crash when receiving uHID events.
+	Fix issue with crash and OBEX disconnect handling.
+	Fix issue with OBEX client transfers and suspend.
+	Fix issue with parsing of MAP application parameters.
+	Fix issue with devices rejecting AVRCP GetCapabilities.
+	Add support for kernel whitelist and Android Bluetooth.
+
+ver 5.22:
+	Fix issue with UHID_OUTPUT events mapping.
+	Fix issue with UHID_FEATURE events handling.
+	Fix issue with UINT32_MAX overflow and AVRCP.
+	Fix issue when dirent type DT_UNKNOWN is returned.
+	Add support for kernel whitelist filtering feature.
+	Add support for Android Bluetooth GATT over BR/EDR.
+
+ver 5.21:
+	Fix issue with SDP requests and wrong PDU size.
+	Fix issue with handling passive scanning triggers.
+	Add support for storing and loading connection parameters.
+	Add support for kernel background auto-connection feature.
+	Add support for Android Bluetooth Scan Parameters feature.
+	Add support for Android Bluetooth Device Information feature.
+	Add support for Android Bluetooth Health Device interface.
+
+ver 5.20:
+	Fix issue with LED handling of PS3 controllers.
+	Add support for Android Bluetooth GATT server interface.
+	Add support for Android Bluetooth HID over GATT feature.
+	Add support for Android Bluetooth multi-profile feature.
+	Add support for Android Bluetooth aptX audio integration.
+
+	Note: aptX codec not included
+
+ver 5.19:
+	Fix issue with OBEX Put-Delete and Create-Empty methods.
+	Fix issue with AVRCP browsable/searchable player properties.
+	Fix issue with handling multiple default agents.
+	Fix issue with handling unpair event per bearer.
+	Fix issue with HID over GATT report ID presence.
+	Add support for HID protocol handling in userspace.
+	Add support for Bluetooth reconnection policy framework.
+	Add support for Android Bluetooth SCO over HCI transport.
+	Add support for Android Bluetooth audio quality control.
+	Add support for Android Bluetooth Low Energy only mode.
+
+ver 5.18:
+	Fix issue with identifying LE single mode devices.
+	Fix issue with L2CAP and RFCOMM peer address lookup.
+	Add support for handling OBEX authentication procedure.
+	Add support for Android Bluetooth GATT client interface.
+
+ver 5.17:
+	Fix issue with not resetting OBEX SRM setup.
+	Fix issue with BR/EDR devices and auto-connect list.
+	Fix issue with bonding complete detection as peripheral.
+	Fix issue with not updating bearer timestamp of connections.
+	Fix issue with paired property for multiple bearers.
+	Add support for Android Bluetooth Handsfree interface.
+	Add support for Android Bluetooth Wideband speech.
+
+ver 5.16:
+	Fix issue with HID over GATT physical location.
+	Fix issue with HID over GATT unique identifier.
+	Fix issue with missing paired property notification.
+	Fix issue with endianess of long term key storage.
+	Add support for storing signature resolving keys.
+	Add support for Android Bluetooth AVRCP interface.
+
+ver 5.15:
+	Fix issue with LE enabling and background scanning.
+	Fix issue with HID over GATT input device name.
+	Fix issue with storage of slave long term keys.
+	Add support for handling identity resolving keys.
+	Add support for Android Bluetooth A2DP interface.
+	Add support for Android Bluetooth audio interface.
+
+ver 5.14:
+	Fix issue with marking PS3 controllers as trusted.
+	Fix issue with authorization of PS3 controllers.
+	Add support for DualShock 4 controller detection.
+	Add support for legacy pairing emulation.
+	Add support for secure simple pairing emulation.
+	Add support for automated pairing testing.
+	Add support for RFCOMM protocol testing.
+	Add support for HCI controller testing.
+
+ver 5.13:
+	Fix issue with PS3 controller detection.
+	Add support for data transfers to L2CAP testing tool.
+	Add support for delay reporting to AVDTP testing tool.
+	Add support for Android Bluetooth Core interface.
+	Add support for Android Bluetooth Socket interface.
+	Add support for Android Bluetooth HID Host interface.
+	Add support for Android Bluetooth PAN interface.
+
+ver 5.12:
+	Fix issue with missing reply to DisconnectProfile.
+	Fix issue with icon property and class of device changes.
+	Fix issue with HID devices when SDP record is not available.
+	Fix issue with handling auto-pairing of printers.
+	Fix issue with agent authorization handling.
+	Add support for PS3 controller setup and pairing.
+	Add support for LE L2CAP CoC test capabilities.
+	Add support for AVDTP qualification test cases.
+	Add support for SMP cryptographic test cases.
+
+ver 5.11:
+	Fix issue with connection attempt when not powered.
+	Fix issue with assigning player to AVRCP target role.
+	Fix issue with OBEX default cache directory.
+	Fix issue with SDP search error handling.
+	Fix issue with processing of SDP records.
+	Fix issue with HID to HCI switching utility.
+	Fix issue with mgmt end-to-end testing tool.
+	Fix issue with L2CAP end-to-end testing tool.
+	Add support for SMP end-to-end testing tool.
+	Add support for more Wii controllers.
+
+ver 5.10:
+	Fix issue with discoverable timeout handling.
+	Fix issue with MAP messages and record version.
+	Fix issue with MAP messages and status events.
+	Fix issue with MAP messages and relative folders.
+	Fix issue with MAP messages and type property signals.
+	Fix issue with transfer size for OBEX GET operations.
+	Fix issue with AVRCP service class identifier.
+	Fix issue with AVRCP tracking seeked signal.
+	Add support for OBEX command line client.
+
+ver 5.9:
+	Fix issue with network service and adapter removal.
+	Fix issue with misleading OBEX error messages.
+	Fix issue with OBEX transport reference handling.
+	Fix issue with memory leak with MAP event handler.
+	Fix issue with missing MAP property changed signal.
+	Fix issue with message type property values.
+	Fix issue with empty UUID list for devices.
+	Fix issue with profile agent cancel method.
+	Remove dependency on USB library.
+
+ver 5.8:
+	Fix issue with missing OBEX session properties.
+	Fix issue with missing SDP service refresh.
+	Fix issue with SDP attribute range check.
+	Fix issue with priority for SDP transactions.
+	Fix issue with service discovery after pairing.
+	Fix issue with race condition in service list.
+	Fix issue with input service state transition.
+	Fix issue with default authorization for profiles.
+	Fix issue with AVRCP browsing channel connections.
+	Add support for AVRCP role agnostic sessions.
+
+ver 5.7:
+	Fix issue with missing UUID discovery during pairing.
+	Fix issue with broken patch for SDP range check handling.
+	Fix issue with AVRCP usage of UID=0 for paused/stopped.
+	Add support MAP notification dispatching.
+
+ver 5.6:
+	Fix issue with incoming connections without SDP record.
+	Fix issue with canceling ongoing device connections.
+	Fix issue with handling failed connection attempts.
+	Fix issue with pending resume during A2DP open failures.
+	Fix issue with registering AVRCP unsupported notification.
+	Fix issue with listing available AVRCP target settings.
+	Fix issue with missing error for OBEX SetPath commands.
+	Fix issue with missing OBEX session command queue.
+	Fix issue with retrieving multiple MAP event reports.
+	Add support for command line player utility.
+
+ver 5.5:
+	Fix issue with race condition between SDP and properties.
+	Fix issue with handling storage of private device addresses.
+	Fix issue with NFC out-of-band pairing and power states.
+	Fix issue with short name during device update handling.
+	Fix issue with handling AVRCP without A2DP being present.
+	Add support for handling AVRCP pass-through operations.
+	Add support for automatically reconnecting HID devices.
+	Add support for automatically pairing of devices.
+
+ver 5.4:
+	Fix issue with invalid memory access and SDP service search.
+	Add support for available player changed event for controller.
+	Add support for UIDs changed event for AVRCP controller.
+	Add support for mandatory AVRCP pass-through operations.
+	Add support for Message Notification Service (MNS) server.
+	Add support for agent methods within command line client.
+
+ver 5.3:
+	Fix issue with registering invalid profiles.
+	Fix issue with inconsistent A2DP transport state.
+	Fix issue with A2DP resume while in configured state.
+	Fix issue with buffer overflow when processing SDP response.
+	Fix issue with missing range check for SDP attribute response.
+	Fix issue with missing validation of SDP data elements.
+	Fix issue with missing fallback to static hostname.
+	Fix issue with default adapter assignment.
+
+ver 5.2:
+	Fix issue with connection handling for Low Energy.
+	Fix issue with broken device discovery handling.
+	Fix issue with invalid memory access within A2DP.
+	Fix issue with handling empty path name of SetPath.
+	Fix issue with handling Message Access Profile filters.
+	Fix issue with handling network service unregistration.
+	Fix issue with not handling bogus device pairing results.
+	Fix issue with initial service discovery and profile manager.
+	Add support for AVRCP volume notifications.
+	Add support for AVRCP browsing commands.
+
+ver 5.1:
+	Fix issue with crash when removing OBEX session.
+	Fix issue with HID device disconnected from kernel.
+	Fix issue with buffer overflow when parsing HID SDP record.
+	Fix issue with SDP_TEXT_STR16 and SDP_URL_STR16 parsing.
+	Add support for integration with systemd's hostname daemon.
+	Add support for separate adapter alias property.
+	Add support for adapter and device modalias properties.
+	Add support for official BlueZ device information.
+	Add support for asynchronous management interface handling.
+	Add tool for testing management interface compliance.
+	Add tool for testing SDP qualification requirements.
+	Add tool for testing various EIR and AD data records.
+
+ver 5.0:
+	Introduce D-Bus Properties and ObjectManager interfaces.
+	Add support for generic profile interface.
+	Add support for global agent interface.
+	Add support for integrated OBEX daemon.
+	Add support for integrated hcidump utility.
+	Add support for Bluetooth tracing and monitor utility.
+	Add support for Bluetooth command line client utility.
+	Remove support for Handsfree gateway handling.
+	Remove support for GStreamer A2DP and SBC elements.
+	Disable default installation of Bluetooth library.
+
 ver 4.101:
 	Fix issue with missing BlueZ service file.
 	Fix issue with aborting A2DP setup during AVDTP start.
 
=== modified file 'Makefile.am'
--- Makefile.am	2015-09-14 10:07:45 +0000
+++ Makefile.am	2015-10-23 13:12:23 +0000
@@ -9,8 +9,6 @@
 
 bin_PROGRAMS =
 
-sbin_PROGRAMS =
-
 noinst_PROGRAMS =
 
 dist_man_MANS =
@@ -21,6 +19,10 @@
 
 EXTRA_DIST =
 
+libexecdir = @libexecdir@/bluetooth
+
+libexec_PROGRAMS =
+
 includedir = @includedir@/bluetooth
 
 include_HEADERS =
@@ -29,26 +31,25 @@
 AM_LDFLAGS = $(MISC_LDFLAGS)
 
 if DATAFILES
-dbusdir = $(sysconfdir)/dbus-1/system.d
-dbusservicedir = $(datadir)/dbus-1/system-services
-
+dbusdir = @DBUS_CONFDIR@/dbus-1/system.d
 dbus_DATA = src/bluetooth.conf
-dbusservice_DATA = src/org.bluez.service
 
 confdir = $(sysconfdir)/bluetooth
-
 conf_DATA =
 
 statedir = $(localstatedir)/lib/bluetooth
-
 state_DATA =
+endif
 
 if SYSTEMD
-systemdunitdir = @SYSTEMD_UNITDIR@
-
-systemdunit_DATA = src/bluetooth.service
-endif
-endif
+systemdsystemunitdir = @SYSTEMD_SYSTEMUNITDIR@
+systemdsystemunit_DATA = src/bluetooth.service
+
+dbussystembusdir = @DBUS_SYSTEMBUSDIR@
+dbussystembus_DATA = src/org.bluez.service
+endif
+
+EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service
 
 plugindir = $(libdir)/bluetooth/plugins
 
@@ -61,216 +62,92 @@
 
 plugin_LTLIBRARIES =
 
-
-lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h lib/mgmt.h \
-		lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h lib/uuid.h \
-		lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h lib/a2mp.h
+lib_sources = lib/bluetooth.c lib/hci.c lib/sdp.c
+lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h \
+		lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h \
+		lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h
+
+extra_headers = lib/mgmt.h lib/uuid.h lib/a2mp.h lib/amp.h
+extra_sources = lib/uuid.c
+
 local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file)))
 
 BUILT_SOURCES = $(local_headers) src/builtin.h
 
+if LIBRARY
 include_HEADERS += $(lib_headers)
 
 lib_LTLIBRARIES += lib/libbluetooth.la
 
-lib_libbluetooth_la_SOURCES = $(lib_headers) \
-				lib/bluetooth.c lib/hci.c lib/sdp.c lib/uuid.c
-lib_libbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -version-info 16:0:13
+lib_libbluetooth_la_SOURCES = $(lib_headers) $(lib_sources)
+lib_libbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -version-info 21:8:18
 lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
-
-noinst_LTLIBRARIES += lib/libbluetooth-private.la
-
-lib_libbluetooth_private_la_SOURCES = $(lib_libbluetooth_la_SOURCES)
-
-if SBC
-noinst_LTLIBRARIES += sbc/libsbc.la
-
-sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sbc.c sbc/sbc_math.h sbc/sbc_tables.h \
-			sbc/sbc_primitives.h sbc/sbc_primitives.c \
-			sbc/sbc_primitives_mmx.h sbc/sbc_primitives_mmx.c \
-			sbc/sbc_primitives_iwmmxt.h sbc/sbc_primitives_iwmmxt.c \
-			sbc/sbc_primitives_neon.h sbc/sbc_primitives_neon.c \
-			sbc/sbc_primitives_armv6.h sbc/sbc_primitives_armv6.c
-
-sbc_libsbc_la_CFLAGS = $(AM_CFLAGS) -finline-functions -fgcse-after-reload \
-					-funswitch-loops -funroll-loops
-
-noinst_PROGRAMS += sbc/sbcinfo sbc/sbcdec sbc/sbcenc
-
-sbc_sbcdec_SOURCES = sbc/sbcdec.c sbc/formats.h
-sbc_sbcdec_LDADD = sbc/libsbc.la
-
-sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
-sbc_sbcenc_LDADD = sbc/libsbc.la
-
-if SNDFILE
-noinst_PROGRAMS += sbc/sbctester
-
-sbc_sbctester_LDADD = @SNDFILE_LIBS@ -lm
-sbc_sbctest_CFLAGS = $(AM_CFLAGS) @SNDFILE_CFLAGS@
-endif
-endif
+endif
+
+noinst_LTLIBRARIES += lib/libbluetooth-internal.la
+
+lib_libbluetooth_internal_la_SOURCES = $(lib_headers) $(lib_sources) \
+					$(extra_headers) $(extra_sources)
+
+noinst_LTLIBRARIES += gdbus/libgdbus-internal.la
+
+gdbus_libgdbus_internal_la_SOURCES = gdbus/gdbus.h \
+				gdbus/mainloop.c gdbus/watch.c \
+				gdbus/object.c gdbus/client.c gdbus/polkit.c
+
+noinst_LTLIBRARIES += src/libshared-glib.la src/libshared-mainloop.la
+
+shared_sources = src/shared/io.h src/shared/timeout.h \
+			src/shared/queue.h src/shared/queue.c \
+			src/shared/util.h src/shared/util.c \
+			src/shared/mgmt.h src/shared/mgmt.c \
+			src/shared/crypto.h src/shared/crypto.c \
+			src/shared/ecc.h src/shared/ecc.c \
+			src/shared/ringbuf.h src/shared/ringbuf.c \
+			src/shared/tester.h src/shared/tester.c \
+			src/shared/hci.h src/shared/hci.c \
+			src/shared/hci-crypto.h src/shared/hci-crypto.c \
+			src/shared/hfp.h src/shared/hfp.c \
+			src/shared/uhid.h src/shared/uhid.c \
+			src/shared/pcap.h src/shared/pcap.c \
+			src/shared/btsnoop.h src/shared/btsnoop.c \
+			src/shared/ad.h src/shared/ad.c \
+			src/shared/att-types.h \
+			src/shared/att.h src/shared/att.c \
+			src/shared/gatt-helpers.h src/shared/gatt-helpers.c \
+			src/shared/gatt-client.h src/shared/gatt-client.c \
+			src/shared/gatt-server.h src/shared/gatt-server.c \
+			src/shared/gatt-db.h src/shared/gatt-db.c \
+			src/shared/gap.h src/shared/gap.c
+
+src_libshared_glib_la_SOURCES = $(shared_sources) \
+				src/shared/io-glib.c \
+				src/shared/timeout-glib.c
+
+src_libshared_mainloop_la_SOURCES = $(shared_sources) \
+				src/shared/io-mainloop.c \
+				src/shared/timeout-mainloop.c \
+				src/shared/mainloop.h src/shared/mainloop.c
 
 attrib_sources = attrib/att.h attrib/att-database.h attrib/att.c \
 		attrib/gatt.h attrib/gatt.c \
-		attrib/gattrib.h attrib/gattrib.c attrib/client.h \
-		attrib/client.c attrib/gatt-service.h attrib/gatt-service.c
-
-gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
-					gdbus/object.c gdbus/polkit.c
+		attrib/gattrib.h attrib/gattrib.c \
+		attrib/gatt-service.h attrib/gatt-service.c
 
 btio_sources = btio/btio.h btio/btio.c
 
+gobex_sources = gobex/gobex.h gobex/gobex.c \
+			gobex/gobex-defs.h gobex/gobex-defs.c \
+			gobex/gobex-packet.c gobex/gobex-packet.h \
+			gobex/gobex-header.c gobex/gobex-header.h \
+			gobex/gobex-transfer.c gobex/gobex-debug.h \
+			gobex/gobex-apparam.c gobex/gobex-apparam.h
+
 builtin_modules =
 builtin_sources =
 builtin_nodist =
-mcap_sources =
-
-if MCAP
-mcap_sources += health/mcap_lib.h health/mcap_internal.h \
-		health/mcap.h health/mcap.c \
-		health/mcap_sync.c
-endif
-
-if PNATPLUGIN
-builtin_modules += pnat
-builtin_sources += plugins/pnat.c
-endif
-
-if AUDIOPLUGIN
-builtin_modules += audio
-builtin_sources += audio/main.c \
-			audio/manager.h audio/manager.c \
-			audio/gateway.h audio/gateway.c \
-			audio/headset.h audio/headset.c \
-			audio/control.h audio/control.c \
-			audio/avctp.h audio/avctp.c \
-			audio/avrcp.h audio/avrcp.c \
-			audio/device.h audio/device.c \
-			audio/source.h audio/source.c \
-			audio/sink.h audio/sink.c \
-			audio/a2dp.h audio/a2dp.c \
-			audio/avdtp.h audio/avdtp.c \
-			audio/ipc.h audio/ipc.c \
-			audio/unix.h audio/unix.c \
-			audio/media.h audio/media.c \
-			audio/transport.h audio/transport.c \
-			audio/telephony.h audio/a2dp-codecs.h
-builtin_nodist += audio/telephony.c
-
-noinst_LIBRARIES += audio/libtelephony.a
-
-audio_libtelephony_a_SOURCES = audio/telephony.h audio/telephony-dummy.c \
-				audio/telephony-maemo5.c audio/telephony-ofono.c \
-				audio/telephony-maemo6.c
-endif
-
-if SAPPLUGIN
-builtin_modules += sap
-builtin_sources += sap/main.c \
-			sap/manager.h sap/manager.c \
-			sap/server.h sap/server.c \
-			sap/sap.h
-
-builtin_nodist += sap/sap.c
-
-noinst_LIBRARIES += sap/libsap.a
-
-sap_libsap_a_SOURCES = sap/sap.h sap/sap-dummy.c sap/sap-u8500.c
-endif
-
-if INPUTPLUGIN
-builtin_modules += input
-builtin_sources += input/main.c \
-			input/manager.h input/manager.c \
-			input/server.h input/server.c \
-			input/device.h input/device.c \
-			input/fakehid.c input/fakehid.h
-endif
-
-if SERIALPLUGIN
-builtin_modules += serial
-builtin_sources += serial/main.c \
-			serial/manager.h serial/manager.c \
-			serial/proxy.h serial/proxy.c \
-			serial/port.h serial/port.c
-endif
-
-if NETWORKPLUGIN
-builtin_modules += network
-builtin_sources += network/main.c \
-			network/manager.h network/manager.c \
-			network/common.h network/common.c \
-			network/server.h network/server.c \
-			network/connection.h network/connection.c
-endif
-
-if SERVICEPLUGIN
-builtin_modules += service
-builtin_sources += plugins/service.c
-endif
-
-if HEALTHPLUGIN
-builtin_modules += health
-builtin_sources += health/hdp_main.c health/hdp_types.h \
-			health/hdp_manager.h health/hdp_manager.c \
-			health/hdp.h health/hdp.c \
-			health/hdp_util.h health/hdp_util.c
-endif
-
-if GATTMODULES
-builtin_modules += thermometer alert time gatt_example proximity \
-			deviceinfo
-builtin_sources += thermometer/main.c \
-			thermometer/manager.h thermometer/manager.c \
-			thermometer/thermometer.h thermometer/thermometer.c \
-			alert/main.c alert/server.h alert/server.c \
-			time/main.c time/server.h time/server.c \
-			plugins/gatt-example.c \
-			proximity/main.c proximity/manager.h proximity/manager.c \
-			proximity/monitor.h proximity/monitor.c \
-			proximity/reporter.h proximity/reporter.c \
-			proximity/linkloss.h proximity/linkloss.c \
-			proximity/immalert.h proximity/immalert.c \
-			deviceinfo/main.c \
-			deviceinfo/manager.h deviceinfo/manager.c \
-			deviceinfo/deviceinfo.h deviceinfo/deviceinfo.c
-endif
-
-
-builtin_modules += hciops mgmtops
-builtin_sources += plugins/hciops.c plugins/mgmtops.c
-
-if HAL
-builtin_modules += hal
-builtin_sources += plugins/hal.c
-else
-builtin_modules += formfactor
-builtin_sources += plugins/formfactor.c
-endif
-
-EXTRA_DIST += plugins/hal.c plugins/formfactor.c
-
-builtin_modules += storage
-builtin_sources += plugins/storage.c
-
-builtin_modules += adaptername
-builtin_sources += plugins/adaptername.c
-
-if WIIMOTEPLUGIN
-builtin_modules += wiimote
-builtin_sources += plugins/wiimote.c
-endif
-
-if MAEMO6PLUGIN
-builtin_modules += maemo6
-builtin_sources += plugins/maemo6.c
-endif
-
-if DBUSOOBPLUGIN
-builtin_modules += dbusoob
-builtin_sources += plugins/dbusoob.c
-endif
+
+include Makefile.plugins
 
 if MAINTAINER_MODE
 plugin_LTLIBRARIES += plugins/external-dummy.la
@@ -280,37 +157,46 @@
 plugins_external_dummy_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden
 endif
 
-sbin_PROGRAMS += src/bluetoothd
+libexec_PROGRAMS += src/bluetoothd
 
-src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+src_bluetoothd_SOURCES = $(builtin_sources) \
 			$(attrib_sources) $(btio_sources) \
-			$(mcap_sources) src/bluetooth.ver \
+			src/bluetooth.ver \
 			src/main.c src/log.h src/log.c \
+			src/systemd.h src/systemd.c \
 			src/rfkill.c src/hcid.h src/sdpd.h \
 			src/sdpd-server.c src/sdpd-request.c \
 			src/sdpd-service.c src/sdpd-database.c \
 			src/attrib-server.h src/attrib-server.c \
+			src/gatt-database.h src/gatt-database.c \
 			src/sdp-xml.h src/sdp-xml.c \
 			src/sdp-client.h src/sdp-client.c \
 			src/textfile.h src/textfile.c \
-			src/glib-helper.h src/glib-helper.c \
-			src/oui.h src/oui.c src/uinput.h src/ppoll.h \
+			src/uuid-helper.h src/uuid-helper.c \
+			src/uinput.h \
 			src/plugin.h src/plugin.c \
 			src/storage.h src/storage.c \
+			src/advertising.h src/advertising.c \
 			src/agent.h src/agent.c \
 			src/error.h src/error.c \
-			src/manager.h src/manager.c \
 			src/adapter.h src/adapter.c \
+			src/profile.h src/profile.c \
+			src/service.h src/service.c \
+			src/gatt-client.h src/gatt-client.c \
 			src/device.h src/device.c src/attio.h \
 			src/dbus-common.c src/dbus-common.h \
-			src/event.h src/event.c \
-			src/oob.h src/oob.c src/eir.h src/eir.c
-src_bluetoothd_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @DBUS_LIBS@ \
-								-ldl -lrt
+			src/eir.h src/eir.c
+src_bluetoothd_LDADD = lib/libbluetooth-internal.la \
+			gdbus/libgdbus-internal.la \
+			src/libshared-glib.la \
+			@GLIB_LIBS@ @DBUS_LIBS@ -ldl -lrt
 src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \
 				-Wl,--version-script=$(srcdir)/src/bluetooth.ver
 
-src_bluetoothd_DEPENDENCIES = lib/libbluetooth-private.la
+src_bluetoothd_DEPENDENCIES = lib/libbluetooth-internal.la \
+				gdbus/libgdbus-internal.la \
+				src/libshared-glib.la \
+				src/bluetooth.service
 
 src_bluetoothd_CFLAGS = $(AM_CFLAGS) -DBLUETOOTH_PLUGIN_BUILTIN \
 					-DPLUGINDIR=\""$(build_plugindir)"\"
@@ -320,171 +206,299 @@
 
 nodist_src_bluetoothd_SOURCES = $(builtin_files)
 
-CLEANFILES += $(builtin_files)
+CLEANFILES += $(builtin_files) src/bluetooth.service
 
 man_MANS = src/bluetoothd.8
 
-if DATAFILES
-conf_DATA += src/main.conf
-endif
-
-EXTRA_DIST += src/genbuiltin src/bluetooth.conf src/org.bluez.service \
-			src/main.conf network/network.conf \
-			input/input.conf serial/serial.conf \
-			audio/audio.conf audio/telephony-dummy.c \
-			audio/telephony-maemo5.c audio/telephony-ofono.c \
-			audio/telephony-maemo6.c sap/sap-dummy.c sap/sap-u8500.c \
-			proximity/proximity.conf
-
-if ALSA
-alsadir = $(libdir)/alsa-lib
-
-alsa_LTLIBRARIES = audio/libasound_module_pcm_bluetooth.la \
-				audio/libasound_module_ctl_bluetooth.la
-
-audio_libasound_module_pcm_bluetooth_la_SOURCES = audio/pcm_bluetooth.c \
-					audio/rtp.h audio/ipc.h audio/ipc.c
-audio_libasound_module_pcm_bluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module \
-						  -avoid-version
-audio_libasound_module_pcm_bluetooth_la_LIBADD = sbc/libsbc.la \
-					lib/libbluetooth-private.la @ALSA_LIBS@
-audio_libasound_module_pcm_bluetooth_la_CFLAGS = $(AM_CFLAGS) @ALSA_CFLAGS@
-
-audio_libasound_module_ctl_bluetooth_la_SOURCES = audio/ctl_bluetooth.c \
-					audio/rtp.h audio/ipc.h audio/ipc.c
-audio_libasound_module_ctl_bluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module \
-						  -avoid-version
-audio_libasound_module_ctl_bluetooth_la_LIBADD = \
-					lib/libbluetooth-private.la @ALSA_LIBS@
-audio_libasound_module_ctl_bluetooth_la_CFLAGS = $(AM_CFLAGS) @ALSA_CFLAGS@
-
-if DATAFILES
-alsaconfdir = $(datadir)/alsa
-
-alsaconf_DATA = audio/bluetooth.conf
-endif
-endif
-
-if AUDIOPLUGIN
-if GSTREAMER
-gstreamerdir = $(libdir)/gstreamer-0.10
-
-gstreamer_LTLIBRARIES = audio/libgstbluetooth.la
-
-audio_libgstbluetooth_la_SOURCES = audio/gstbluetooth.c audio/gstpragma.h \
-				audio/gstsbcenc.h audio/gstsbcenc.c \
-				audio/gstsbcdec.h audio/gstsbcdec.c \
-				audio/gstsbcparse.h audio/gstsbcparse.c \
-				audio/gstavdtpsink.h audio/gstavdtpsink.c \
-				audio/gsta2dpsink.h audio/gsta2dpsink.c \
-				audio/gstsbcutil.h audio/gstsbcutil.c \
-				audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c \
-				audio/rtp.h audio/ipc.h audio/ipc.c
-audio_libgstbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth-private.la \
-						@DBUS_LIBS@ @GSTREAMER_LIBS@ \
-						-lgstaudio-0.10 -lgstrtp-0.10
-audio_libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \
-                               $(AM_CFLAGS) @DBUS_CFLAGS@ @GSTREAMER_CFLAGS@
-endif
-endif
-
-EXTRA_DIST += audio/bluetooth.conf
-
+EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
+			src/main.conf profiles/network/network.conf \
+			profiles/input/input.conf profiles/proximity/proximity.conf
+
+test_scripts =
+unit_tests =
 
 include Makefile.tools
+include Makefile.obexd
+include android/Makefile.am
 
-if DATAFILES
+if HID2HCI
 rulesdir = @UDEV_DIR@/rules.d
 
-udev_files =
-
-if HID2HCI
-udev_files += scripts/bluetooth-hid2hci.rules
-endif
-
-if PCMCIA
-udevdir = @UDEV_DIR@
-
-udev_files += scripts/bluetooth-serial.rules
-
-dist_udev_SCRIPTS = scripts/bluetooth_serial
-endif
-
-rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file)))
-endif
+rules_DATA = tools/97-hid2hci.rules
 
 CLEANFILES += $(rules_DATA)
-
-EXTRA_DIST += scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
-
-EXTRA_DIST += doc/manager-api.txt \
+endif
+
+EXTRA_DIST += tools/hid2hci.rules
+
+if TEST
+testdir = $(pkglibdir)/test
+test_SCRIPTS = $(test_scripts)
+endif
+
+EXTRA_DIST += $(test_scripts)
+
+EXTRA_DIST += doc/assigned-numbers.txt doc/supported-features.txt \
+				doc/test-coverage.txt \
+				doc/test-runner.txt \
+				doc/settings-storage.txt
+
+EXTRA_DIST += doc/mgmt-api.txt \
 		doc/adapter-api.txt doc/device-api.txt \
-		doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
-		doc/serial-api.txt doc/network-api.txt \
-		doc/input-api.txt doc/audio-api.txt doc/control-api.txt \
-		doc/hfp-api.txt doc/health-api.txt doc/sap-api.txt \
-		doc/media-api.txt doc/assigned-numbers.txt
-
-AM_YFLAGS = -d
+		doc/agent-api.txt doc/profile-api.txt \
+		doc/network-api.txt doc/media-api.txt \
+		doc/health-api.txt doc/sap-api.txt \
+		doc/input-api.txt
+
+EXTRA_DIST += doc/alert-api.txt \
+		doc/proximity-api.txt doc/heartrate-api.txt \
+		doc/thermometer-api.txt doc/cyclingspeed-api.txt \
+		doc/gatt-api.txt doc/advertising-api.txt
+
+EXTRA_DIST += doc/obex-api.txt doc/obex-agent-api.txt
+
+EXTRA_DIST += doc/pics-opp.txt doc/pixit-opp.txt \
+		doc/pts-opp.txt
+
+EXTRA_DIST += tools/magic.btsnoop
 
 AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
 
-INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
-			-I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \
-			-I$(srcdir)/attrib -I$(srcdir)/btio -I$(srcdir)/tools \
-			-I$(builddir)/tools -I$(srcdir)/monitor
-
-if MCAP
-INCLUDES += -I$(builddir)/health
-endif
-
-unit_objects =
-
-if TEST
-unit_tests = unit/test-eir
-
+AM_CPPFLAGS = -I$(builddir)/lib
+
+
+unit_tests += unit/test-eir
+
+unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/uuid-helper.c
+unit_test_eir_LDADD = src/libshared-glib.la lib/libbluetooth-internal.la \
+								@GLIB_LIBS@
+
+unit_tests += unit/test-uuid
+
+unit_test_uuid_SOURCES = unit/test-uuid.c
+unit_test_uuid_LDADD = src/libshared-glib.la lib/libbluetooth-internal.la \
+								@GLIB_LIBS@
+
+unit_tests += unit/test-textfile
+
+unit_test_textfile_SOURCES = unit/test-textfile.c src/textfile.h src/textfile.c
+unit_test_textfile_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-crc
+
+unit_test_crc_SOURCES = unit/test-crc.c monitor/crc.h monitor/crc.c
+unit_test_crc_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-crypto
+
+unit_test_crypto_SOURCES = unit/test-crypto.c
+unit_test_crypto_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-ecc
+
+unit_test_ecc_SOURCES = unit/test-ecc.c
+unit_test_ecc_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-ringbuf unit/test-queue
+
+unit_test_ringbuf_SOURCES = unit/test-ringbuf.c
+unit_test_ringbuf_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_test_queue_SOURCES = unit/test-queue.c
+unit_test_queue_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-mgmt
+
+unit_test_mgmt_SOURCES = unit/test-mgmt.c
+unit_test_mgmt_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-uhid
+
+unit_test_uhid_SOURCES = unit/test-uhid.c
+unit_test_uhid_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-sdp
+
+unit_test_sdp_SOURCES = unit/test-sdp.c \
+				src/sdpd.h src/sdpd-database.c \
+				src/log.h src/log.c \
+				src/sdpd-service.c src/sdpd-request.c
+unit_test_sdp_LDADD = lib/libbluetooth-internal.la \
+				src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-avdtp
+
+unit_test_avdtp_SOURCES = unit/test-avdtp.c \
+				src/log.h src/log.c \
+				android/avdtp.c android/avdtp.h
+unit_test_avdtp_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-avctp
+
+unit_test_avctp_SOURCES = unit/test-avctp.c \
+				src/log.h src/log.c \
+				android/avctp.c android/avctp.h
+unit_test_avctp_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-avrcp
+
+unit_test_avrcp_SOURCES = unit/test-avrcp.c \
+				src/log.h src/log.c \
+				android/avctp.c android/avctp.h \
+				android/avrcp-lib.c android/avrcp-lib.h
+unit_test_avrcp_LDADD = lib/libbluetooth-internal.la \
+				src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-hfp
+
+unit_test_hfp_SOURCES = unit/test-hfp.c
+unit_test_hfp_LDADD = src/libshared-glib.la @GLIB_LIBS@
+
+unit_tests += unit/test-gdbus-client
+
+unit_test_gdbus_client_SOURCES = unit/test-gdbus-client.c
+unit_test_gdbus_client_LDADD = gdbus/libgdbus-internal.la \
+				src/libshared-glib.la @GLIB_LIBS@ @DBUS_LIBS@
+
+unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \
+			unit/test-gobex-transfer unit/test-gobex-apparam
+
+unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \
+						unit/test-gobex.c
+unit_test_gobex_LDADD = @GLIB_LIBS@
+
+unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \
+						unit/test-gobex-packet.c
+unit_test_gobex_packet_LDADD = @GLIB_LIBS@
+
+unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \
+						unit/test-gobex-header.c
+unit_test_gobex_header_LDADD = @GLIB_LIBS@
+
+unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \
+						unit/test-gobex-transfer.c
+unit_test_gobex_transfer_LDADD = @GLIB_LIBS@
+
+unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \
+						unit/test-gobex-apparam.c
+unit_test_gobex_apparam_LDADD = @GLIB_LIBS@
+
+unit_tests += unit/test-lib
+
+unit_test_lib_SOURCES = unit/test-lib.c
+unit_test_lib_LDADD = src/libshared-glib.la \
+				lib/libbluetooth-internal.la @GLIB_LIBS@
+
+unit_tests += unit/test-gatt
+
+unit_test_gatt_SOURCES = unit/test-gatt.c
+unit_test_gatt_LDADD = src/libshared-glib.la \
+				lib/libbluetooth-internal.la @GLIB_LIBS@
+
+unit_tests += unit/test-hog
+
+unit_test_hog_SOURCES = unit/test-hog.c \
+			$(btio_sources) \
+			android/hog.h android/hog.c \
+			android/scpp.h android/scpp.c \
+			android/bas.h android/bas.c \
+			android/dis.h android/dis.c \
+			src/log.h src/log.c \
+			attrib/att.h attrib/att.c \
+			attrib/gatt.h attrib/gatt.c \
+			attrib/gattrib.h attrib/gattrib.c
+unit_test_hog_LDADD = src/libshared-glib.la \
+				lib/libbluetooth-internal.la @GLIB_LIBS@
+
+unit_tests += unit/test-gattrib
+
+unit_test_gattrib_SOURCES = unit/test-gattrib.c attrib/gattrib.c $(btio_sources) src/log.h src/log.c
+unit_test_gattrib_LDADD = lib/libbluetooth-internal.la \
+			src/libshared-glib.la \
+			@GLIB_LIBS@ @DBUS_LIBS@ -ldl -lrt
+
+if MAINTAINER_MODE
 noinst_PROGRAMS += $(unit_tests)
-
-unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
-unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
-unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
-unit_objects += $(unit_test_eir_OBJECTS)
-else
-unit_tests =
 endif
 
 TESTS = $(unit_tests)
+AM_TESTS_ENVIRONMENT = MALLOC_CHECK_=3 MALLOC_PERTURB_=69
+
+if DBUS_RUN_SESSION
+AM_TESTS_ENVIRONMENT += dbus-run-session --
+endif
+
+if VALGRIND
+LOG_COMPILER = valgrind --error-exitcode=1 --num-callers=30
+LOG_FLAGS = --trace-children=yes --leak-check=full --show-reachable=no \
+		--suppressions=$(srcdir)/tools/valgrind.supp --quiet
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-pkgconfig_DATA = bluez.pc
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles
-
-DISTCLEANFILES = $(pkgconfig_DATA)
+if LIBRARY
+pkgconfig_DATA = lib/bluez.pc
+endif
+
+manual_pages = doc/btmon.1
+
+if MANPAGES
+dist_noinst_MANS += $(manual_pages)
+endif
+
+EXTRA_DIST += $(manual_pages:.1=.txt)
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \
+					--enable-manpages --enable-android \
+					--disable-systemd --disable-udev
+
+DISTCLEANFILES = $(pkgconfig_DATA) $(unit_tests) $(manual_pages)
 
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
-	ltmain.sh depcomp compile missing install-sh mkinstalldirs ylwrap
+	ltmain.sh depcomp compile missing install-sh mkinstalldirs test-driver
+
+SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+		$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
+		< $< > $@
+
+%.service: %.service.in Makefile
+	$(SED_PROCESS)
+
+%.1: %.txt
+	$(AM_V_GEN)a2x --doctype manpage --format manpage $(srcdir)/$<
 
 src/builtin.h: src/genbuiltin $(builtin_sources)
 	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
 
-audio/telephony.c: audio/@TELEPHONY_DRIVER@
-	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
-
-sap/sap.c: sap/@SAP_DRIVER@
-	$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
-
-scripts/%.rules:
-	$(AM_V_GEN)cp $(subst 97-,,$@) $@
+tools/%.rules:
+	$(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
 
 $(lib_libbluetooth_la_OBJECTS): $(local_headers)
 
 lib/bluetooth/%.h: lib/%.h
 	$(AM_V_at)$(MKDIR_P) lib/bluetooth
-	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
-
+	$(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
+
+if COVERAGE
+clean-coverage:
+	@lcov --directory $(top_builddir) --zerocounters
+	$(RM) -r coverage $(top_builddir)/coverage.info
+
+coverage: check
+	@lcov --compat-libtool --directory $(top_builddir) --capture \
+				--output-file $(top_builddir)/coverage.info
+	$(AM_V_at)$(MKDIR_P) coverage
+	@genhtml -o coverage/ $(top_builddir)/coverage.info
+
+clean-local: clean-coverage
+	-find $(top_builddir) -name "*.gcno" -delete
+	-find $(top_builddir) -name "*.gcda" -delete
+	$(RM) -r lib/bluetooth
+
+else
 clean-local:
+	-find $(top_builddir) -name "*.gcno" -delete
+	-find $(top_builddir) -name "*.gcda" -delete
 	$(RM) -r lib/bluetooth
+endif
 
=== modified file 'Makefile.in'
--- Makefile.in	2015-09-11 09:01:46 +0000
+++ Makefile.in	2015-10-23 13:12:23 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,6 +20,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -39,173 +83,125 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
-	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
-	$(am__EXEEXT_7)
-sbin_PROGRAMS = src/bluetoothd$(EXEEXT) $(am__EXEEXT_14) \
-	$(am__EXEEXT_15) $(am__EXEEXT_16)
-noinst_PROGRAMS = $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
-	$(am__EXEEXT_11) $(am__EXEEXT_13)
-@SBC_TRUE@am__append_1 = sbc/libsbc.la
-@SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc
-@SBC_TRUE@@SNDFILE_TRUE@am__append_3 = sbc/sbctester
-@MCAP_TRUE@am__append_4 = health/mcap_lib.h health/mcap_internal.h \
-@MCAP_TRUE@		health/mcap.h health/mcap.c \
-@MCAP_TRUE@		health/mcap_sync.c
-
-@PNATPLUGIN_TRUE@am__append_5 = pnat
-@PNATPLUGIN_TRUE@am__append_6 = plugins/pnat.c
-@AUDIOPLUGIN_TRUE@am__append_7 = audio
-@AUDIOPLUGIN_TRUE@am__append_8 = audio/main.c \
-@AUDIOPLUGIN_TRUE@			audio/manager.h audio/manager.c \
-@AUDIOPLUGIN_TRUE@			audio/gateway.h audio/gateway.c \
-@AUDIOPLUGIN_TRUE@			audio/headset.h audio/headset.c \
-@AUDIOPLUGIN_TRUE@			audio/control.h audio/control.c \
-@AUDIOPLUGIN_TRUE@			audio/avctp.h audio/avctp.c \
-@AUDIOPLUGIN_TRUE@			audio/avrcp.h audio/avrcp.c \
-@AUDIOPLUGIN_TRUE@			audio/device.h audio/device.c \
-@AUDIOPLUGIN_TRUE@			audio/source.h audio/source.c \
-@AUDIOPLUGIN_TRUE@			audio/sink.h audio/sink.c \
-@AUDIOPLUGIN_TRUE@			audio/a2dp.h audio/a2dp.c \
-@AUDIOPLUGIN_TRUE@			audio/avdtp.h audio/avdtp.c \
-@AUDIOPLUGIN_TRUE@			audio/ipc.h audio/ipc.c \
-@AUDIOPLUGIN_TRUE@			audio/unix.h audio/unix.c \
-@AUDIOPLUGIN_TRUE@			audio/media.h audio/media.c \
-@AUDIOPLUGIN_TRUE@			audio/transport.h audio/transport.c \
-@AUDIOPLUGIN_TRUE@			audio/telephony.h audio/a2dp-codecs.h
-
-@AUDIOPLUGIN_TRUE@am__append_9 = audio/telephony.c
-@AUDIOPLUGIN_TRUE@am__append_10 = audio/libtelephony.a
-@SAPPLUGIN_TRUE@am__append_11 = sap
-@SAPPLUGIN_TRUE@am__append_12 = sap/main.c \
-@SAPPLUGIN_TRUE@			sap/manager.h sap/manager.c \
-@SAPPLUGIN_TRUE@			sap/server.h sap/server.c \
-@SAPPLUGIN_TRUE@			sap/sap.h
-
-@SAPPLUGIN_TRUE@am__append_13 = sap/sap.c
-@SAPPLUGIN_TRUE@am__append_14 = sap/libsap.a
-@INPUTPLUGIN_TRUE@am__append_15 = input
-@INPUTPLUGIN_TRUE@am__append_16 = input/main.c \
-@INPUTPLUGIN_TRUE@			input/manager.h input/manager.c \
-@INPUTPLUGIN_TRUE@			input/server.h input/server.c \
-@INPUTPLUGIN_TRUE@			input/device.h input/device.c \
-@INPUTPLUGIN_TRUE@			input/fakehid.c input/fakehid.h
-
-@SERIALPLUGIN_TRUE@am__append_17 = serial
-@SERIALPLUGIN_TRUE@am__append_18 = serial/main.c \
-@SERIALPLUGIN_TRUE@			serial/manager.h serial/manager.c \
-@SERIALPLUGIN_TRUE@			serial/proxy.h serial/proxy.c \
-@SERIALPLUGIN_TRUE@			serial/port.h serial/port.c
-
-@NETWORKPLUGIN_TRUE@am__append_19 = network
-@NETWORKPLUGIN_TRUE@am__append_20 = network/main.c \
-@NETWORKPLUGIN_TRUE@			network/manager.h network/manager.c \
-@NETWORKPLUGIN_TRUE@			network/common.h network/common.c \
-@NETWORKPLUGIN_TRUE@			network/server.h network/server.c \
-@NETWORKPLUGIN_TRUE@			network/connection.h network/connection.c
-
-@SERVICEPLUGIN_TRUE@am__append_21 = service
-@SERVICEPLUGIN_TRUE@am__append_22 = plugins/service.c
-@HEALTHPLUGIN_TRUE@am__append_23 = health
-@HEALTHPLUGIN_TRUE@am__append_24 = health/hdp_main.c health/hdp_types.h \
-@HEALTHPLUGIN_TRUE@			health/hdp_manager.h health/hdp_manager.c \
-@HEALTHPLUGIN_TRUE@			health/hdp.h health/hdp.c \
-@HEALTHPLUGIN_TRUE@			health/hdp_util.h health/hdp_util.c
-
-@GATTMODULES_TRUE@am__append_25 = thermometer alert time gatt_example proximity \
-@GATTMODULES_TRUE@			deviceinfo
-
-@GATTMODULES_TRUE@am__append_26 = thermometer/main.c \
-@GATTMODULES_TRUE@			thermometer/manager.h thermometer/manager.c \
-@GATTMODULES_TRUE@			thermometer/thermometer.h thermometer/thermometer.c \
-@GATTMODULES_TRUE@			alert/main.c alert/server.h alert/server.c \
-@GATTMODULES_TRUE@			time/main.c time/server.h time/server.c \
-@GATTMODULES_TRUE@			plugins/gatt-example.c \
-@GATTMODULES_TRUE@			proximity/main.c proximity/manager.h proximity/manager.c \
-@GATTMODULES_TRUE@			proximity/monitor.h proximity/monitor.c \
-@GATTMODULES_TRUE@			proximity/reporter.h proximity/reporter.c \
-@GATTMODULES_TRUE@			proximity/linkloss.h proximity/linkloss.c \
-@GATTMODULES_TRUE@			proximity/immalert.h proximity/immalert.c \
-@GATTMODULES_TRUE@			deviceinfo/main.c \
-@GATTMODULES_TRUE@			deviceinfo/manager.h deviceinfo/manager.c \
-@GATTMODULES_TRUE@			deviceinfo/deviceinfo.h deviceinfo/deviceinfo.c
-
-@HAL_TRUE@am__append_27 = hal
-@HAL_TRUE@am__append_28 = plugins/hal.c
-@HAL_FALSE@am__append_29 = formfactor
-@HAL_FALSE@am__append_30 = plugins/formfactor.c
-@WIIMOTEPLUGIN_TRUE@am__append_31 = wiimote
-@WIIMOTEPLUGIN_TRUE@am__append_32 = plugins/wiimote.c
-@MAEMO6PLUGIN_TRUE@am__append_33 = maemo6
-@MAEMO6PLUGIN_TRUE@am__append_34 = plugins/maemo6.c
-@DBUSOOBPLUGIN_TRUE@am__append_35 = dbusoob
-@DBUSOOBPLUGIN_TRUE@am__append_36 = plugins/dbusoob.c
-@MAINTAINER_MODE_TRUE@am__append_37 = plugins/external-dummy.la
-DIST_COMMON = README $(am__configure_deps) \
-	$(am__dist_udev_SCRIPTS_DIST) $(dist_man_MANS) \
-	$(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.tools $(srcdir)/bluez.pc.in \
-	$(srcdir)/config.h.in $(top_srcdir)/configure \
-	$(top_srcdir)/doc/version.xml.in \
-	$(top_srcdir)/src/bluetooth.service.in \
-	$(top_srcdir)/src/bluetoothd.8.in AUTHORS COPYING COPYING.LIB \
-	ChangeLog INSTALL NEWS TODO compile config.guess config.sub \
-	depcomp install-sh ltmain.sh missing tools/lexer.c \
-	tools/parser.c tools/parser.h ylwrap
-@DATAFILES_TRUE@@TOOLS_TRUE@am__append_38 = tools/rfcomm.conf
-@TOOLS_TRUE@am__append_39 = tools/rfcomm tools/l2ping \
-@TOOLS_TRUE@				tools/hcitool tools/sdptool tools/ciptool
-
-@TOOLS_TRUE@am__append_40 = tools/hciattach tools/hciconfig
-@TOOLS_TRUE@am__append_41 = tools/avinfo tools/ppporc \
-@TOOLS_TRUE@	tools/hcieventmask tools/hcisecfilter mgmt/btmgmt \
-@TOOLS_TRUE@	monitor/btmon emulator/btvirt
-@READLINE_TRUE@@TOOLS_TRUE@am__append_42 = attrib/gatttool
-@TOOLS_TRUE@am__append_43 = tools/rfcomm.1 tools/l2ping.8 \
-@TOOLS_TRUE@			tools/hciattach.8 tools/hciconfig.8 \
-@TOOLS_TRUE@			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
-
-@TOOLS_FALSE@am__append_44 = tools/rfcomm.1 tools/l2ping.8 \
-@TOOLS_FALSE@			tools/hciattach.8 tools/hciconfig.8 \
-@TOOLS_FALSE@			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
-
-@BCCMD_TRUE@am__append_45 = tools/bccmd
-@BCCMD_TRUE@@USB_TRUE@am__append_46 = tools/csr_usb.c
-@BCCMD_TRUE@@USB_TRUE@am__append_47 = @USB_LIBS@
-@BCCMD_TRUE@am__append_48 = tools/bccmd.8
-@BCCMD_FALSE@am__append_49 = tools/bccmd.8
+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+noinst_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+	$(am__EXEEXT_7) $(am__EXEEXT_10)
+libexec_PROGRAMS = src/bluetoothd$(EXEEXT) obexd/src/obexd$(EXEEXT)
+@LIBRARY_TRUE@am__append_1 = $(lib_headers)
+@LIBRARY_TRUE@am__append_2 = lib/libbluetooth.la
+DIST_COMMON = $(srcdir)/Makefile.plugins $(srcdir)/Makefile.tools \
+	$(srcdir)/Makefile.obexd $(srcdir)/android/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in $(top_srcdir)/src/bluetoothd.8.in \
+	$(top_srcdir)/lib/bluez.pc.in depcomp $(dist_man_MANS) \
+	$(am__include_HEADERS_DIST) test-driver AUTHORS COPYING \
+	COPYING.LIB ChangeLog INSTALL NEWS README TODO compile \
+	config.guess config.sub install-sh missing ltmain.sh
+@MAINTAINER_MODE_TRUE@am__append_3 = gatt_example
+@MAINTAINER_MODE_TRUE@am__append_4 = plugins/gatt-example.c
+@EXPERIMENTAL_TRUE@am__append_5 = neard sap
+@EXPERIMENTAL_TRUE@am__append_6 = plugins/neard.c profiles/sap/main.c \
+@EXPERIMENTAL_TRUE@	profiles/sap/manager.h \
+@EXPERIMENTAL_TRUE@	profiles/sap/manager.c \
+@EXPERIMENTAL_TRUE@	profiles/sap/server.h profiles/sap/server.c \
+@EXPERIMENTAL_TRUE@	profiles/sap/sap.h profiles/sap/sap-dummy.c
+@EXPERIMENTAL_TRUE@am__append_7 = profiles/sap/libsap.a
+@EXPERIMENTAL_TRUE@am__append_8 = health
+@EXPERIMENTAL_TRUE@am__append_9 = profiles/health/mcap.h profiles/health/mcap.c \
+@EXPERIMENTAL_TRUE@			profiles/health/hdp_main.c profiles/health/hdp_types.h \
+@EXPERIMENTAL_TRUE@			profiles/health/hdp_manager.h \
+@EXPERIMENTAL_TRUE@			profiles/health/hdp_manager.c \
+@EXPERIMENTAL_TRUE@			profiles/health/hdp.h profiles/health/hdp.c \
+@EXPERIMENTAL_TRUE@			profiles/health/hdp_util.h profiles/health/hdp_util.c
+
+@EXPERIMENTAL_TRUE@am__append_10 = alert time proximity thermometer \
+@EXPERIMENTAL_TRUE@	heartrate cyclingspeed
+@EXPERIMENTAL_TRUE@am__append_11 = profiles/alert/server.c \
+@EXPERIMENTAL_TRUE@	profiles/time/server.c \
+@EXPERIMENTAL_TRUE@	profiles/proximity/main.c \
+@EXPERIMENTAL_TRUE@	profiles/proximity/manager.h \
+@EXPERIMENTAL_TRUE@	profiles/proximity/manager.c \
+@EXPERIMENTAL_TRUE@	profiles/proximity/monitor.h \
+@EXPERIMENTAL_TRUE@	profiles/proximity/monitor.c \
+@EXPERIMENTAL_TRUE@	profiles/proximity/reporter.h \
+@EXPERIMENTAL_TRUE@	profiles/proximity/reporter.c \
+@EXPERIMENTAL_TRUE@	profiles/proximity/linkloss.h \
+@EXPERIMENTAL_TRUE@	profiles/proximity/linkloss.c \
+@EXPERIMENTAL_TRUE@	profiles/proximity/immalert.h \
+@EXPERIMENTAL_TRUE@	profiles/proximity/immalert.c \
+@EXPERIMENTAL_TRUE@	profiles/thermometer/thermometer.c \
+@EXPERIMENTAL_TRUE@	profiles/heartrate/heartrate.c \
+@EXPERIMENTAL_TRUE@	profiles/cyclingspeed/cyclingspeed.c
+@SIXAXIS_TRUE@am__append_12 = plugins/sixaxis.la
+@MAINTAINER_MODE_TRUE@am__append_13 = plugins/external-dummy.la
+@CLIENT_TRUE@am__append_14 = client/bluetoothctl
+@MONITOR_TRUE@am__append_15 = monitor/btmon
+@EXPERIMENTAL_TRUE@am__append_16 = emulator/btvirt emulator/b1ee \
+@EXPERIMENTAL_TRUE@	emulator/hfp peripheral/btsensor tools/3dsp \
+@EXPERIMENTAL_TRUE@	tools/mgmt-tester tools/gap-tester \
+@EXPERIMENTAL_TRUE@	tools/l2cap-tester tools/sco-tester \
+@EXPERIMENTAL_TRUE@	tools/smp-tester tools/hci-tester \
+@EXPERIMENTAL_TRUE@	tools/rfcomm-tester tools/bnep-tester \
+@EXPERIMENTAL_TRUE@	tools/userchan-tester tools/bdaddr \
+@EXPERIMENTAL_TRUE@	tools/avinfo tools/avtest tools/scotest \
+@EXPERIMENTAL_TRUE@	tools/amptest tools/hwdb tools/hcieventmask \
+@EXPERIMENTAL_TRUE@	tools/hcisecfilter tools/btinfo \
+@EXPERIMENTAL_TRUE@	tools/btattach tools/btsnoop tools/btproxy \
+@EXPERIMENTAL_TRUE@	tools/btiotest tools/bneptest \
+@EXPERIMENTAL_TRUE@	tools/mcaptest tools/cltest tools/oobtest \
+@EXPERIMENTAL_TRUE@	tools/seq2bseq tools/nokfw \
+@EXPERIMENTAL_TRUE@	tools/create-image tools/eddystone \
+@EXPERIMENTAL_TRUE@	tools/ibeacon tools/btgatt-client \
+@EXPERIMENTAL_TRUE@	tools/btgatt-server tools/test-runner \
+@EXPERIMENTAL_TRUE@	tools/check-selftest
+@TOOLS_TRUE@am__append_17 = tools/hciattach tools/hciconfig tools/hcitool tools/hcidump \
+@TOOLS_TRUE@			tools/rfcomm tools/rctest tools/l2test tools/l2ping \
+@TOOLS_TRUE@			tools/sdptool tools/ciptool tools/bccmd \
+@TOOLS_TRUE@			tools/bluemoon tools/hex2hcd tools/mpris-proxy
+
+@TOOLS_TRUE@am__append_18 = tools/hciattach.1 tools/hciconfig.1 \
+@TOOLS_TRUE@			tools/hcitool.1 tools/hcidump.1 \
+@TOOLS_TRUE@			tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
+@TOOLS_TRUE@			tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
+
+@TOOLS_FALSE@am__append_19 = tools/hciattach.1 tools/hciconfig.1 \
+@TOOLS_FALSE@			tools/hcitool.1 tools/hcidump.1 \
+@TOOLS_FALSE@			tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
+@TOOLS_FALSE@			tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
+
 @HID2HCI_TRUE@udev_PROGRAMS = tools/hid2hci$(EXEEXT)
-@HID2HCI_TRUE@am__append_50 = tools/hid2hci.8
-@HID2HCI_FALSE@am__append_51 = tools/hid2hci.8
-@DFUTOOL_TRUE@am__append_52 = tools/dfutool
-@DFUTOOL_TRUE@am__append_53 = tools/dfutool.1
-@DFUTOOL_FALSE@am__append_54 = tools/dfutool.1
-@USB_TRUE@am__append_55 = tools/dfubabel tools/avctrl
-@CUPS_TRUE@cups_PROGRAMS = cups/bluetooth$(EXEEXT)
-@TEST_TRUE@am__append_56 = test/hciemu
-@TEST_TRUE@am__append_57 = test/l2test test/rctest
-@TEST_TRUE@am__append_58 = test/gaptest test/sdptest test/scotest \
-@TEST_TRUE@	test/attest test/hstest test/avtest test/ipctest \
-@TEST_TRUE@	test/lmptest test/bdaddr test/agent test/btiotest \
-@TEST_TRUE@	test/test-textfile test/uuidtest test/mpris-player \
-@TEST_TRUE@	$(unit_tests)
-@TEST_TRUE@am__append_59 = test/rctest.1 test/hciemu.1
-@TEST_TRUE@am__append_60 = test/bdaddr.8
-@TEST_FALSE@am__append_61 = test/rctest.1 test/hciemu.1 test/bdaddr.8
-@HIDD_TRUE@am__append_62 = compat/hidd
-@HIDD_TRUE@am__append_63 = compat/hidd.1
-@HIDD_FALSE@am__append_64 = compat/hidd.1
-@PAND_TRUE@am__append_65 = compat/pand
-@PAND_TRUE@am__append_66 = compat/pand.1
-@PAND_FALSE@am__append_67 = compat/pand.1
-@DUND_TRUE@am__append_68 = compat/dund
-@DUND_TRUE@am__append_69 = compat/dund.1
-@DUND_FALSE@am__append_70 = compat/dund.1
-@DATAFILES_TRUE@@HID2HCI_TRUE@am__append_71 = scripts/bluetooth-hid2hci.rules
-@DATAFILES_TRUE@@PCMCIA_TRUE@am__append_72 = scripts/bluetooth-serial.rules
-@MCAP_TRUE@am__append_73 = -I$(builddir)/health
-@TEST_TRUE@am__append_74 = $(unit_test_eir_OBJECTS)
-TESTS = $(am__EXEEXT_12)
+@HID2HCI_TRUE@am__append_20 = tools/hid2hci.1
+@HID2HCI_FALSE@am__append_21 = tools/hid2hci.1
+@EXPERIMENTAL_TRUE@am__append_22 = tools/bdaddr.1
+@READLINE_TRUE@am__append_23 = attrib/gatttool tools/btmgmt \
+@READLINE_TRUE@			tools/obex-client-tool tools/obex-server-tool \
+@READLINE_TRUE@			tools/bluetooth-player tools/obexctl
+
+@EXPERIMENTAL_TRUE@am__append_24 = tools/gatt-service \
+@EXPERIMENTAL_TRUE@	profiles/iap/iapd
+@CUPS_TRUE@cups_PROGRAMS = profiles/cups/bluetooth$(EXEEXT)
+@EXPERIMENTAL_TRUE@am__append_25 = pcsuite
+@EXPERIMENTAL_TRUE@am__append_26 = obexd/plugins/pcsuite.c
+@OBEX_TRUE@am__append_27 = irmc pbap
+@OBEX_TRUE@am__append_28 = obexd/plugins/irmc.c obexd/plugins/pbap.c \
+@OBEX_TRUE@	obexd/plugins/vcard.h obexd/plugins/vcard.c \
+@OBEX_TRUE@	obexd/plugins/phonebook.h \
+@OBEX_TRUE@	obexd/plugins/phonebook-dummy.c
+@ANDROID_TRUE@am__append_29 = -DANDROID_VERSION=0x050100
+@ANDROID_TRUE@am__append_30 = android/system-emulator \
+@ANDROID_TRUE@	android/bluetoothd-snoop android/bluetoothd \
+@ANDROID_TRUE@	android/avdtptest android/haltest \
+@ANDROID_TRUE@	android/android-tester android/ipc-tester
+@ANDROID_TRUE@am__append_31 = android/bluetooth.default.la \
+@ANDROID_TRUE@	android/audio.a2dp.default.la \
+@ANDROID_TRUE@	android/audio.sco.default.la
+@ANDROID_TRUE@am__append_32 = android/test-ipc
+@HID2HCI_TRUE@am__append_33 = $(rules_DATA)
+@MAINTAINER_MODE_TRUE@am__append_34 = $(unit_tests)
+TESTS = $(am__EXEEXT_9)
+@DBUS_RUN_SESSION_TRUE@am__append_35 = dbus-run-session --
+@MANPAGES_TRUE@am__append_36 = $(manual_pages)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -216,36 +212,22 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = doc/version.xml src/bluetoothd.8 \
-	src/bluetooth.service bluez.pc
+CONFIG_CLEAN_FILES = src/bluetoothd.8 lib/bluez.pc
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-audio_libtelephony_a_AR = $(AR) $(ARFLAGS)
-audio_libtelephony_a_LIBADD =
-am__audio_libtelephony_a_SOURCES_DIST = audio/telephony.h \
-	audio/telephony-dummy.c audio/telephony-maemo5.c \
-	audio/telephony-ofono.c audio/telephony-maemo6.c
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+profiles_sap_libsap_a_AR = $(AR) $(ARFLAGS)
+profiles_sap_libsap_a_LIBADD =
+am__profiles_sap_libsap_a_SOURCES_DIST = profiles/sap/sap.h \
+	profiles/sap/sap-u8500.c
 am__dirstamp = $(am__leading_dot)dirstamp
-@AUDIOPLUGIN_TRUE@am_audio_libtelephony_a_OBJECTS =  \
-@AUDIOPLUGIN_TRUE@	audio/telephony-dummy.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/telephony-maemo5.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/telephony-ofono.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/telephony-maemo6.$(OBJEXT)
-audio_libtelephony_a_OBJECTS = $(am_audio_libtelephony_a_OBJECTS)
-sap_libsap_a_AR = $(AR) $(ARFLAGS)
-sap_libsap_a_LIBADD =
-am__sap_libsap_a_SOURCES_DIST = sap/sap.h sap/sap-dummy.c \
-	sap/sap-u8500.c
-@SAPPLUGIN_TRUE@am_sap_libsap_a_OBJECTS = sap/sap-dummy.$(OBJEXT) \
-@SAPPLUGIN_TRUE@	sap/sap-u8500.$(OBJEXT)
-sap_libsap_a_OBJECTS = $(am_sap_libsap_a_OBJECTS)
+@EXPERIMENTAL_TRUE@am_profiles_sap_libsap_a_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	profiles/sap/sap-u8500.$(OBJEXT)
+profiles_sap_libsap_a_OBJECTS = $(am_profiles_sap_libsap_a_OBJECTS)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -273,93 +255,124 @@
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(alsadir)" "$(DESTDIR)$(gstreamerdir)" \
-	"$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" \
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsdir)" \
-	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(udevdir)" \
-	"$(DESTDIR)$(udevdir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(alsaconfdir)" \
-	"$(DESTDIR)$(confdir)" "$(DESTDIR)$(dbusdir)" \
-	"$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(udevdir)" \
+	"$(DESTDIR)$(testdir)" "$(DESTDIR)$(man1dir)" \
+	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(confdir)" \
+	"$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(dbussessionbusdir)" \
+	"$(DESTDIR)$(dbussystembusdir)" "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(statedir)" \
-	"$(DESTDIR)$(systemdunitdir)" "$(DESTDIR)$(includedir)"
-LTLIBRARIES = $(alsa_LTLIBRARIES) $(gstreamer_LTLIBRARIES) \
-	$(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES)
-@ALSA_TRUE@audio_libasound_module_ctl_bluetooth_la_DEPENDENCIES =  \
-@ALSA_TRUE@	lib/libbluetooth-private.la
-am__audio_libasound_module_ctl_bluetooth_la_SOURCES_DIST =  \
-	audio/ctl_bluetooth.c audio/rtp.h audio/ipc.h audio/ipc.c
-@ALSA_TRUE@am_audio_libasound_module_ctl_bluetooth_la_OBJECTS = audio/audio_libasound_module_ctl_bluetooth_la-ctl_bluetooth.lo \
-@ALSA_TRUE@	audio/audio_libasound_module_ctl_bluetooth_la-ipc.lo
-audio_libasound_module_ctl_bluetooth_la_OBJECTS =  \
-	$(am_audio_libasound_module_ctl_bluetooth_la_OBJECTS)
+	"$(DESTDIR)$(systemdsystemunitdir)" \
+	"$(DESTDIR)$(systemduserunitdir)" "$(DESTDIR)$(includedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
+	$(plugin_LTLIBRARIES)
+android_audio_a2dp_default_la_DEPENDENCIES =
+am__android_audio_a2dp_default_la_SOURCES_DIST = android/audio-msg.h \
+	android/hal-msg.h android/hal-audio.h android/hal-audio.c \
+	android/hal-audio-sbc.c android/hal-audio-aptx.c \
+	android/hardware/audio.h android/hardware/audio_effect.h \
+	android/hardware/hardware.h android/system/audio.h
+@ANDROID_TRUE@am_android_audio_a2dp_default_la_OBJECTS = android/android_audio_a2dp_default_la-hal-audio.lo \
+@ANDROID_TRUE@	android/android_audio_a2dp_default_la-hal-audio-sbc.lo \
+@ANDROID_TRUE@	android/android_audio_a2dp_default_la-hal-audio-aptx.lo
+android_audio_a2dp_default_la_OBJECTS =  \
+	$(am_android_audio_a2dp_default_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-audio_libasound_module_ctl_bluetooth_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(audio_libasound_module_ctl_bluetooth_la_CFLAGS) \
-	$(CFLAGS) $(audio_libasound_module_ctl_bluetooth_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@ALSA_TRUE@am_audio_libasound_module_ctl_bluetooth_la_rpath = -rpath \
-@ALSA_TRUE@	$(alsadir)
-@ALSA_TRUE@audio_libasound_module_pcm_bluetooth_la_DEPENDENCIES =  \
-@ALSA_TRUE@	sbc/libsbc.la lib/libbluetooth-private.la
-am__audio_libasound_module_pcm_bluetooth_la_SOURCES_DIST =  \
-	audio/pcm_bluetooth.c audio/rtp.h audio/ipc.h audio/ipc.c
-@ALSA_TRUE@am_audio_libasound_module_pcm_bluetooth_la_OBJECTS = audio/audio_libasound_module_pcm_bluetooth_la-pcm_bluetooth.lo \
-@ALSA_TRUE@	audio/audio_libasound_module_pcm_bluetooth_la-ipc.lo
-audio_libasound_module_pcm_bluetooth_la_OBJECTS =  \
-	$(am_audio_libasound_module_pcm_bluetooth_la_OBJECTS)
-audio_libasound_module_pcm_bluetooth_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(audio_libasound_module_pcm_bluetooth_la_CFLAGS) \
-	$(CFLAGS) $(audio_libasound_module_pcm_bluetooth_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@ALSA_TRUE@am_audio_libasound_module_pcm_bluetooth_la_rpath = -rpath \
-@ALSA_TRUE@	$(alsadir)
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@audio_libgstbluetooth_la_DEPENDENCIES =  \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	sbc/libsbc.la \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	lib/libbluetooth-private.la
-am__audio_libgstbluetooth_la_SOURCES_DIST = audio/gstbluetooth.c \
-	audio/gstpragma.h audio/gstsbcenc.h audio/gstsbcenc.c \
-	audio/gstsbcdec.h audio/gstsbcdec.c audio/gstsbcparse.h \
-	audio/gstsbcparse.c audio/gstavdtpsink.h audio/gstavdtpsink.c \
-	audio/gsta2dpsink.h audio/gsta2dpsink.c audio/gstsbcutil.h \
-	audio/gstsbcutil.c audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c \
-	audio/rtp.h audio/ipc.h audio/ipc.c
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@am_audio_libgstbluetooth_la_OBJECTS = audio/audio_libgstbluetooth_la-gstbluetooth.lo \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	audio/audio_libgstbluetooth_la-gstsbcenc.lo \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	audio/audio_libgstbluetooth_la-gstsbcdec.lo \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	audio/audio_libgstbluetooth_la-gstsbcparse.lo \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	audio/audio_libgstbluetooth_la-gstavdtpsink.lo \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	audio/audio_libgstbluetooth_la-gsta2dpsink.lo \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	audio/audio_libgstbluetooth_la-gstsbcutil.lo \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	audio/audio_libgstbluetooth_la-gstrtpsbcpay.lo \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	audio/audio_libgstbluetooth_la-ipc.lo
-audio_libgstbluetooth_la_OBJECTS =  \
-	$(am_audio_libgstbluetooth_la_OBJECTS)
-audio_libgstbluetooth_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(audio_libgstbluetooth_la_CFLAGS) $(CFLAGS) \
-	$(audio_libgstbluetooth_la_LDFLAGS) $(LDFLAGS) -o $@
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@am_audio_libgstbluetooth_la_rpath =  \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@	-rpath $(gstreamerdir)
-lib_libbluetooth_private_la_LIBADD =
+am__v_lt_1 = 
+android_audio_a2dp_default_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(android_audio_a2dp_default_la_CFLAGS) $(CFLAGS) \
+	$(android_audio_a2dp_default_la_LDFLAGS) $(LDFLAGS) -o $@
+@ANDROID_TRUE@am_android_audio_a2dp_default_la_rpath = -rpath \
+@ANDROID_TRUE@	$(plugindir)
+android_audio_sco_default_la_DEPENDENCIES =
+am__android_audio_sco_default_la_SOURCES_DIST = android/hal-log.h \
+	android/sco-msg.h android/hal-sco.c android/hardware/audio.h \
+	android/hardware/audio_effect.h android/hardware/hardware.h \
+	android/audio_utils/resampler.c \
+	android/audio_utils/resampler.h android/system/audio.h
+@ANDROID_TRUE@am_android_audio_sco_default_la_OBJECTS =  \
+@ANDROID_TRUE@	android/android_audio_sco_default_la-hal-sco.lo \
+@ANDROID_TRUE@	android/audio_utils/android_audio_sco_default_la-resampler.lo
+android_audio_sco_default_la_OBJECTS =  \
+	$(am_android_audio_sco_default_la_OBJECTS)
+android_audio_sco_default_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(android_audio_sco_default_la_CFLAGS) $(CFLAGS) \
+	$(android_audio_sco_default_la_LDFLAGS) $(LDFLAGS) -o $@
+@ANDROID_TRUE@am_android_audio_sco_default_la_rpath = -rpath \
+@ANDROID_TRUE@	$(plugindir)
+android_bluetooth_default_la_LIBADD =
+am__android_bluetooth_default_la_SOURCES_DIST = android/hal.h \
+	android/hal-bluetooth.c android/hal-socket.c \
+	android/hal-hidhost.c android/hal-health.c android/hal-pan.c \
+	android/hal-a2dp.c android/hal-a2dp-sink.c android/hal-avrcp.c \
+	android/hal-avrcp-ctrl.c android/hal-handsfree.c \
+	android/hal-handsfree-client.c android/hal-gatt.c \
+	android/hal-map-client.c android/hardware/bluetooth.h \
+	android/hardware/bt_av.h android/hardware/bt_gatt.h \
+	android/hardware/bt_gatt_client.h \
+	android/hardware/bt_gatt_server.h \
+	android/hardware/bt_gatt_types.h android/hardware/bt_hf.h \
+	android/hardware/bt_hh.h android/hardware/bt_hl.h \
+	android/hardware/bt_pan.h android/hardware/bt_rc.h \
+	android/hardware/bt_sock.h android/hardware/bt_hf_client.h \
+	android/hardware/bt_mce.h android/hardware/hardware.h \
+	android/cutils/properties.h android/ipc-common.h \
+	android/hal-log.h android/hal-ipc.h android/hal-ipc.c \
+	android/hal-utils.h android/hal-utils.c
+@ANDROID_TRUE@am_android_bluetooth_default_la_OBJECTS = android/android_bluetooth_default_la-hal-bluetooth.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-socket.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-hidhost.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-health.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-pan.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-a2dp.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-a2dp-sink.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-avrcp.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-avrcp-ctrl.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-handsfree.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-handsfree-client.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-gatt.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-map-client.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-ipc.lo \
+@ANDROID_TRUE@	android/android_bluetooth_default_la-hal-utils.lo
+android_bluetooth_default_la_OBJECTS =  \
+	$(am_android_bluetooth_default_la_OBJECTS)
+android_bluetooth_default_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(android_bluetooth_default_la_CFLAGS) $(CFLAGS) \
+	$(android_bluetooth_default_la_LDFLAGS) $(LDFLAGS) -o $@
+@ANDROID_TRUE@am_android_bluetooth_default_la_rpath = -rpath \
+@ANDROID_TRUE@	$(plugindir)
+gdbus_libgdbus_internal_la_LIBADD =
+am_gdbus_libgdbus_internal_la_OBJECTS = gdbus/mainloop.lo \
+	gdbus/watch.lo gdbus/object.lo gdbus/client.lo gdbus/polkit.lo
+gdbus_libgdbus_internal_la_OBJECTS =  \
+	$(am_gdbus_libgdbus_internal_la_OBJECTS)
+lib_libbluetooth_internal_la_LIBADD =
 am__objects_1 =
-am__objects_2 = $(am__objects_1) lib/bluetooth.lo lib/hci.lo \
-	lib/sdp.lo lib/uuid.lo
-am_lib_libbluetooth_private_la_OBJECTS = $(am__objects_2)
-lib_libbluetooth_private_la_OBJECTS =  \
-	$(am_lib_libbluetooth_private_la_OBJECTS)
+am__objects_2 = lib/bluetooth.lo lib/hci.lo lib/sdp.lo
+am__objects_3 = lib/uuid.lo
+am_lib_libbluetooth_internal_la_OBJECTS = $(am__objects_1) \
+	$(am__objects_2) $(am__objects_1) $(am__objects_3)
+lib_libbluetooth_internal_la_OBJECTS =  \
+	$(am_lib_libbluetooth_internal_la_OBJECTS)
 lib_libbluetooth_la_LIBADD =
-am_lib_libbluetooth_la_OBJECTS = $(am__objects_1) lib/bluetooth.lo \
-	lib/hci.lo lib/sdp.lo lib/uuid.lo
+am__lib_libbluetooth_la_SOURCES_DIST = lib/bluetooth.h lib/hci.h \
+	lib/hci_lib.h lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h \
+	lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h lib/bluetooth.c \
+	lib/hci.c lib/sdp.c
+@LIBRARY_TRUE@am_lib_libbluetooth_la_OBJECTS = $(am__objects_1) \
+@LIBRARY_TRUE@	$(am__objects_2)
 lib_libbluetooth_la_OBJECTS = $(am_lib_libbluetooth_la_OBJECTS)
 lib_libbluetooth_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(lib_libbluetooth_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
+@LIBRARY_TRUE@am_lib_libbluetooth_la_rpath = -rpath $(libdir)
 plugins_external_dummy_la_LIBADD =
 am__plugins_external_dummy_la_SOURCES_DIST = plugins/external-dummy.c
 @MAINTAINER_MODE_TRUE@am_plugins_external_dummy_la_OBJECTS = plugins/plugins_external_dummy_la-external-dummy.lo
@@ -371,489 +384,1210 @@
 	$(plugins_external_dummy_la_LDFLAGS) $(LDFLAGS) -o $@
 @MAINTAINER_MODE_TRUE@am_plugins_external_dummy_la_rpath = -rpath \
 @MAINTAINER_MODE_TRUE@	$(plugindir)
-sbc_libsbc_la_LIBADD =
-am__sbc_libsbc_la_SOURCES_DIST = sbc/sbc.h sbc/sbc.c sbc/sbc_math.h \
-	sbc/sbc_tables.h sbc/sbc_primitives.h sbc/sbc_primitives.c \
-	sbc/sbc_primitives_mmx.h sbc/sbc_primitives_mmx.c \
-	sbc/sbc_primitives_iwmmxt.h sbc/sbc_primitives_iwmmxt.c \
-	sbc/sbc_primitives_neon.h sbc/sbc_primitives_neon.c \
-	sbc/sbc_primitives_armv6.h sbc/sbc_primitives_armv6.c
-@SBC_TRUE@am_sbc_libsbc_la_OBJECTS = sbc/sbc_libsbc_la-sbc.lo \
-@SBC_TRUE@	sbc/sbc_libsbc_la-sbc_primitives.lo \
-@SBC_TRUE@	sbc/sbc_libsbc_la-sbc_primitives_mmx.lo \
-@SBC_TRUE@	sbc/sbc_libsbc_la-sbc_primitives_iwmmxt.lo \
-@SBC_TRUE@	sbc/sbc_libsbc_la-sbc_primitives_neon.lo \
-@SBC_TRUE@	sbc/sbc_libsbc_la-sbc_primitives_armv6.lo
-sbc_libsbc_la_OBJECTS = $(am_sbc_libsbc_la_OBJECTS)
-sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(sbc_libsbc_la_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@SBC_TRUE@am_sbc_libsbc_la_rpath =
-@TOOLS_TRUE@am__EXEEXT_1 = tools/rfcomm$(EXEEXT) tools/l2ping$(EXEEXT) \
-@TOOLS_TRUE@	tools/hcitool$(EXEEXT) tools/sdptool$(EXEEXT) \
-@TOOLS_TRUE@	tools/ciptool$(EXEEXT)
-@READLINE_TRUE@@TOOLS_TRUE@am__EXEEXT_2 = attrib/gatttool$(EXEEXT)
-@DFUTOOL_TRUE@am__EXEEXT_3 = tools/dfutool$(EXEEXT)
-@TEST_TRUE@am__EXEEXT_4 = test/l2test$(EXEEXT) test/rctest$(EXEEXT)
-@HIDD_TRUE@am__EXEEXT_5 = compat/hidd$(EXEEXT)
-@PAND_TRUE@am__EXEEXT_6 = compat/pand$(EXEEXT)
-@DUND_TRUE@am__EXEEXT_7 = compat/dund$(EXEEXT)
-@SBC_TRUE@am__EXEEXT_8 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \
-@SBC_TRUE@	sbc/sbcenc$(EXEEXT)
-@SBC_TRUE@@SNDFILE_TRUE@am__EXEEXT_9 = sbc/sbctester$(EXEEXT)
-@TOOLS_TRUE@am__EXEEXT_10 = tools/avinfo$(EXEEXT) \
-@TOOLS_TRUE@	tools/ppporc$(EXEEXT) tools/hcieventmask$(EXEEXT) \
-@TOOLS_TRUE@	tools/hcisecfilter$(EXEEXT) mgmt/btmgmt$(EXEEXT) \
-@TOOLS_TRUE@	monitor/btmon$(EXEEXT) emulator/btvirt$(EXEEXT)
-@USB_TRUE@am__EXEEXT_11 = tools/dfubabel$(EXEEXT) \
-@USB_TRUE@	tools/avctrl$(EXEEXT)
-@TEST_TRUE@am__EXEEXT_12 = unit/test-eir$(EXEEXT)
-@TEST_TRUE@am__EXEEXT_13 = test/gaptest$(EXEEXT) test/sdptest$(EXEEXT) \
-@TEST_TRUE@	test/scotest$(EXEEXT) test/attest$(EXEEXT) \
-@TEST_TRUE@	test/hstest$(EXEEXT) test/avtest$(EXEEXT) \
-@TEST_TRUE@	test/ipctest$(EXEEXT) test/lmptest$(EXEEXT) \
-@TEST_TRUE@	test/bdaddr$(EXEEXT) test/agent$(EXEEXT) \
-@TEST_TRUE@	test/btiotest$(EXEEXT) test/test-textfile$(EXEEXT) \
-@TEST_TRUE@	test/uuidtest$(EXEEXT) test/mpris-player$(EXEEXT) \
-@TEST_TRUE@	$(am__EXEEXT_12)
-@TOOLS_TRUE@am__EXEEXT_14 = tools/hciattach$(EXEEXT) \
-@TOOLS_TRUE@	tools/hciconfig$(EXEEXT)
-@BCCMD_TRUE@am__EXEEXT_15 = tools/bccmd$(EXEEXT)
-@TEST_TRUE@am__EXEEXT_16 = test/hciemu$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(cups_PROGRAMS) $(noinst_PROGRAMS) \
-	$(sbin_PROGRAMS) $(udev_PROGRAMS)
+plugins_sixaxis_la_LIBADD =
+am__plugins_sixaxis_la_SOURCES_DIST = plugins/sixaxis.c
+@SIXAXIS_TRUE@am_plugins_sixaxis_la_OBJECTS =  \
+@SIXAXIS_TRUE@	plugins/plugins_sixaxis_la-sixaxis.lo
+plugins_sixaxis_la_OBJECTS = $(am_plugins_sixaxis_la_OBJECTS)
+plugins_sixaxis_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(plugins_sixaxis_la_CFLAGS) $(CFLAGS) \
+	$(plugins_sixaxis_la_LDFLAGS) $(LDFLAGS) -o $@
+@SIXAXIS_TRUE@am_plugins_sixaxis_la_rpath = -rpath $(plugindir)
+src_libshared_glib_la_LIBADD =
+am__objects_4 = src/shared/queue.lo src/shared/util.lo \
+	src/shared/mgmt.lo src/shared/crypto.lo src/shared/ecc.lo \
+	src/shared/ringbuf.lo src/shared/tester.lo src/shared/hci.lo \
+	src/shared/hci-crypto.lo src/shared/hfp.lo src/shared/uhid.lo \
+	src/shared/pcap.lo src/shared/btsnoop.lo src/shared/ad.lo \
+	src/shared/att.lo src/shared/gatt-helpers.lo \
+	src/shared/gatt-client.lo src/shared/gatt-server.lo \
+	src/shared/gatt-db.lo src/shared/gap.lo
+am_src_libshared_glib_la_OBJECTS = $(am__objects_4) \
+	src/shared/io-glib.lo src/shared/timeout-glib.lo
+src_libshared_glib_la_OBJECTS = $(am_src_libshared_glib_la_OBJECTS)
+src_libshared_mainloop_la_LIBADD =
+am_src_libshared_mainloop_la_OBJECTS = $(am__objects_4) \
+	src/shared/io-mainloop.lo src/shared/timeout-mainloop.lo \
+	src/shared/mainloop.lo
+src_libshared_mainloop_la_OBJECTS =  \
+	$(am_src_libshared_mainloop_la_OBJECTS)
+@CLIENT_TRUE@am__EXEEXT_1 = client/bluetoothctl$(EXEEXT)
+@MONITOR_TRUE@am__EXEEXT_2 = monitor/btmon$(EXEEXT)
+@TOOLS_TRUE@am__EXEEXT_3 = tools/hciattach$(EXEEXT) \
+@TOOLS_TRUE@	tools/hciconfig$(EXEEXT) tools/hcitool$(EXEEXT) \
+@TOOLS_TRUE@	tools/hcidump$(EXEEXT) tools/rfcomm$(EXEEXT) \
+@TOOLS_TRUE@	tools/rctest$(EXEEXT) tools/l2test$(EXEEXT) \
+@TOOLS_TRUE@	tools/l2ping$(EXEEXT) tools/sdptool$(EXEEXT) \
+@TOOLS_TRUE@	tools/ciptool$(EXEEXT) tools/bccmd$(EXEEXT) \
+@TOOLS_TRUE@	tools/bluemoon$(EXEEXT) tools/hex2hcd$(EXEEXT) \
+@TOOLS_TRUE@	tools/mpris-proxy$(EXEEXT)
+@EXPERIMENTAL_TRUE@am__EXEEXT_4 = emulator/btvirt$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	emulator/b1ee$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hfp$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	peripheral/btsensor$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/3dsp$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/mgmt-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/gap-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/l2cap-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/sco-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/smp-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/hci-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/rfcomm-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/bnep-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/userchan-tester$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/bdaddr$(EXEEXT) tools/avinfo$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/avtest$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/scotest$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/amptest$(EXEEXT) tools/hwdb$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/hcieventmask$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/hcisecfilter$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/btinfo$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/btattach$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/btsnoop$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/btproxy$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/btiotest$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/bneptest$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/mcaptest$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/cltest$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/oobtest$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/seq2bseq$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/nokfw$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/create-image$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/eddystone$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/ibeacon$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/btgatt-client$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/btgatt-server$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/test-runner$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	tools/check-selftest$(EXEEXT)
+@READLINE_TRUE@am__EXEEXT_5 = attrib/gatttool$(EXEEXT) \
+@READLINE_TRUE@	tools/btmgmt$(EXEEXT) \
+@READLINE_TRUE@	tools/obex-client-tool$(EXEEXT) \
+@READLINE_TRUE@	tools/obex-server-tool$(EXEEXT) \
+@READLINE_TRUE@	tools/bluetooth-player$(EXEEXT) \
+@READLINE_TRUE@	tools/obexctl$(EXEEXT)
+@EXPERIMENTAL_TRUE@am__EXEEXT_6 = tools/gatt-service$(EXEEXT) \
+@EXPERIMENTAL_TRUE@	profiles/iap/iapd$(EXEEXT)
+@ANDROID_TRUE@am__EXEEXT_7 = android/system-emulator$(EXEEXT) \
+@ANDROID_TRUE@	android/bluetoothd-snoop$(EXEEXT) \
+@ANDROID_TRUE@	android/bluetoothd$(EXEEXT) \
+@ANDROID_TRUE@	android/avdtptest$(EXEEXT) \
+@ANDROID_TRUE@	android/haltest$(EXEEXT) \
+@ANDROID_TRUE@	android/android-tester$(EXEEXT) \
+@ANDROID_TRUE@	android/ipc-tester$(EXEEXT)
+@ANDROID_TRUE@am__EXEEXT_8 = android/test-ipc$(EXEEXT)
+am__EXEEXT_9 = $(am__EXEEXT_8) unit/test-eir$(EXEEXT) \
+	unit/test-uuid$(EXEEXT) unit/test-textfile$(EXEEXT) \
+	unit/test-crc$(EXEEXT) unit/test-crypto$(EXEEXT) \
+	unit/test-ecc$(EXEEXT) unit/test-ringbuf$(EXEEXT) \
+	unit/test-queue$(EXEEXT) unit/test-mgmt$(EXEEXT) \
+	unit/test-uhid$(EXEEXT) unit/test-sdp$(EXEEXT) \
+	unit/test-avdtp$(EXEEXT) unit/test-avctp$(EXEEXT) \
+	unit/test-avrcp$(EXEEXT) unit/test-hfp$(EXEEXT) \
+	unit/test-gdbus-client$(EXEEXT) \
+	unit/test-gobex-header$(EXEEXT) \
+	unit/test-gobex-packet$(EXEEXT) unit/test-gobex$(EXEEXT) \
+	unit/test-gobex-transfer$(EXEEXT) \
+	unit/test-gobex-apparam$(EXEEXT) unit/test-lib$(EXEEXT) \
+	unit/test-gatt$(EXEEXT) unit/test-hog$(EXEEXT) \
+	unit/test-gattrib$(EXEEXT)
+@MAINTAINER_MODE_TRUE@am__EXEEXT_10 = $(am__EXEEXT_9)
+PROGRAMS = $(bin_PROGRAMS) $(cups_PROGRAMS) $(libexec_PROGRAMS) \
+	$(noinst_PROGRAMS) $(udev_PROGRAMS)
+am__android_android_tester_SOURCES_DIST = emulator/hciemu.h \
+	emulator/hciemu.c emulator/btdev.h emulator/btdev.c \
+	emulator/bthost.h emulator/bthost.c emulator/smp.c \
+	monitor/rfcomm.h android/hardware/hardware.c \
+	android/tester-bluetooth.c android/tester-socket.c \
+	android/tester-hidhost.c android/tester-pan.c \
+	android/tester-hdp.c android/tester-a2dp.c \
+	android/tester-avrcp.c android/tester-gatt.c \
+	android/tester-map-client.c android/tester-main.h \
+	android/tester-main.c
+@ANDROID_TRUE@am_android_android_tester_OBJECTS = emulator/android_android_tester-hciemu.$(OBJEXT) \
+@ANDROID_TRUE@	emulator/android_android_tester-btdev.$(OBJEXT) \
+@ANDROID_TRUE@	emulator/android_android_tester-bthost.$(OBJEXT) \
+@ANDROID_TRUE@	emulator/android_android_tester-smp.$(OBJEXT) \
+@ANDROID_TRUE@	android/hardware/android_android_tester-hardware.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-bluetooth.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-socket.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-hidhost.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-pan.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-hdp.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-a2dp.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-avrcp.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-gatt.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-map-client.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_android_tester-tester-main.$(OBJEXT)
+android_android_tester_OBJECTS = $(am_android_android_tester_OBJECTS)
+@ANDROID_TRUE@android_android_tester_DEPENDENCIES =  \
+@ANDROID_TRUE@	lib/libbluetooth-internal.la \
+@ANDROID_TRUE@	src/libshared-glib.la
+android_android_tester_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(android_android_tester_CFLAGS) $(CFLAGS) \
+	$(android_android_tester_LDFLAGS) $(LDFLAGS) -o $@
+am__android_avdtptest_SOURCES_DIST = android/avdtptest.c src/log.h \
+	src/log.c btio/btio.h btio/btio.c src/shared/util.h \
+	src/shared/util.c src/shared/queue.h src/shared/queue.c \
+	android/avdtp.h android/avdtp.c
+@ANDROID_TRUE@am_android_avdtptest_OBJECTS =  \
+@ANDROID_TRUE@	android/android_avdtptest-avdtptest.$(OBJEXT) \
+@ANDROID_TRUE@	src/android_avdtptest-log.$(OBJEXT) \
+@ANDROID_TRUE@	btio/android_avdtptest-btio.$(OBJEXT) \
+@ANDROID_TRUE@	src/shared/android_avdtptest-util.$(OBJEXT) \
+@ANDROID_TRUE@	src/shared/android_avdtptest-queue.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_avdtptest-avdtp.$(OBJEXT)
+android_avdtptest_OBJECTS = $(am_android_avdtptest_OBJECTS)
+@ANDROID_TRUE@android_avdtptest_DEPENDENCIES =  \
+@ANDROID_TRUE@	lib/libbluetooth-internal.la
+android_avdtptest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(android_avdtptest_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am__android_bluetoothd_SOURCES_DIST = android/main.c src/log.c \
+	android/hal-msg.h android/audio-msg.h android/sco-msg.h \
+	android/utils.h src/sdpd-database.c src/sdpd-server.c \
+	src/sdpd-service.c src/sdpd-request.c src/uuid-helper.h \
+	src/uuid-helper.c src/eir.h src/eir.c android/bluetooth.h \
+	android/bluetooth.c android/hidhost.h android/hidhost.c \
+	android/scpp.h android/scpp.c android/dis.h android/dis.c \
+	android/bas.h android/bas.c android/hog.h android/hog.c \
+	android/ipc-common.h android/ipc.h android/ipc.c \
+	android/avdtp.h android/avdtp.c android/a2dp.h android/a2dp.c \
+	android/a2dp-sink.h android/a2dp-sink.c android/avctp.h \
+	android/avctp.c android/avrcp.h android/avrcp.c \
+	android/avrcp-lib.h android/avrcp-lib.c android/socket.h \
+	android/socket.c android/sco.h android/sco.c android/pan.h \
+	android/pan.c android/handsfree.h android/handsfree.c \
+	android/handsfree-client.c android/handsfree-client.h \
+	android/gatt.h android/gatt.c android/health.h \
+	android/health.c profiles/health/mcap.h profiles/health/mcap.c \
+	android/map-client.h android/map-client.c attrib/att.c \
+	attrib/att.h attrib/gatt.c attrib/gatt.h attrib/gattrib.c \
+	attrib/gattrib.h btio/btio.h btio/btio.c src/sdp-client.h \
+	src/sdp-client.c profiles/network/bnep.h \
+	profiles/network/bnep.c
+@ANDROID_TRUE@am_android_bluetoothd_OBJECTS = android/main.$(OBJEXT) \
+@ANDROID_TRUE@	src/log.$(OBJEXT) src/sdpd-database.$(OBJEXT) \
+@ANDROID_TRUE@	src/sdpd-server.$(OBJEXT) \
+@ANDROID_TRUE@	src/sdpd-service.$(OBJEXT) \
+@ANDROID_TRUE@	src/sdpd-request.$(OBJEXT) \
+@ANDROID_TRUE@	src/uuid-helper.$(OBJEXT) src/eir.$(OBJEXT) \
+@ANDROID_TRUE@	android/bluetooth.$(OBJEXT) \
+@ANDROID_TRUE@	android/hidhost.$(OBJEXT) android/scpp.$(OBJEXT) \
+@ANDROID_TRUE@	android/dis.$(OBJEXT) android/bas.$(OBJEXT) \
+@ANDROID_TRUE@	android/hog.$(OBJEXT) android/ipc.$(OBJEXT) \
+@ANDROID_TRUE@	android/avdtp.$(OBJEXT) android/a2dp.$(OBJEXT) \
+@ANDROID_TRUE@	android/a2dp-sink.$(OBJEXT) \
+@ANDROID_TRUE@	android/avctp.$(OBJEXT) android/avrcp.$(OBJEXT) \
+@ANDROID_TRUE@	android/avrcp-lib.$(OBJEXT) \
+@ANDROID_TRUE@	android/socket.$(OBJEXT) android/sco.$(OBJEXT) \
+@ANDROID_TRUE@	android/pan.$(OBJEXT) \
+@ANDROID_TRUE@	android/handsfree.$(OBJEXT) \
+@ANDROID_TRUE@	android/handsfree-client.$(OBJEXT) \
+@ANDROID_TRUE@	android/gatt.$(OBJEXT) android/health.$(OBJEXT) \
+@ANDROID_TRUE@	profiles/health/mcap.$(OBJEXT) \
+@ANDROID_TRUE@	android/map-client.$(OBJEXT) \
+@ANDROID_TRUE@	attrib/att.$(OBJEXT) attrib/gatt.$(OBJEXT) \
+@ANDROID_TRUE@	attrib/gattrib.$(OBJEXT) btio/btio.$(OBJEXT) \
+@ANDROID_TRUE@	src/sdp-client.$(OBJEXT) \
+@ANDROID_TRUE@	profiles/network/bnep.$(OBJEXT)
+android_bluetoothd_OBJECTS = $(am_android_bluetoothd_OBJECTS)
+@ANDROID_TRUE@android_bluetoothd_DEPENDENCIES =  \
+@ANDROID_TRUE@	lib/libbluetooth-internal.la \
+@ANDROID_TRUE@	src/libshared-glib.la
+am__android_bluetoothd_snoop_SOURCES_DIST =  \
+	android/bluetoothd-snoop.c src/log.c
+@ANDROID_TRUE@am_android_bluetoothd_snoop_OBJECTS =  \
+@ANDROID_TRUE@	android/bluetoothd-snoop.$(OBJEXT) \
+@ANDROID_TRUE@	src/log.$(OBJEXT)
+android_bluetoothd_snoop_OBJECTS =  \
+	$(am_android_bluetoothd_snoop_OBJECTS)
+@ANDROID_TRUE@android_bluetoothd_snoop_DEPENDENCIES =  \
+@ANDROID_TRUE@	src/libshared-mainloop.la
+am__android_haltest_SOURCES_DIST = android/client/haltest.c \
+	android/client/pollhandler.h android/client/pollhandler.c \
+	android/client/terminal.h android/client/terminal.c \
+	android/client/history.h android/client/history.c \
+	android/client/tabcompletion.c android/client/if-main.h \
+	android/client/if-av.c android/client/if-av-sink.c \
+	android/client/if-rc.c android/client/if-rc-ctrl.c \
+	android/client/if-bt.c android/client/if-gatt.c \
+	android/client/if-hf.c android/client/if-hf-client.c \
+	android/client/if-hh.c android/client/if-pan.c \
+	android/client/if-hl.c android/client/if-sock.c \
+	android/client/if-audio.c android/client/if-sco.c \
+	android/client/if-mce.c android/hardware/hardware.c \
+	android/hal-utils.h android/hal-utils.c
+@ANDROID_TRUE@am_android_haltest_OBJECTS = android/client/android_haltest-haltest.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-pollhandler.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-terminal.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-history.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-tabcompletion.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-av.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-av-sink.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-rc.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-rc-ctrl.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-bt.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-gatt.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-hf.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-hf-client.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-hh.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-pan.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-hl.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-sock.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-audio.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-sco.$(OBJEXT) \
+@ANDROID_TRUE@	android/client/android_haltest-if-mce.$(OBJEXT) \
+@ANDROID_TRUE@	android/hardware/android_haltest-hardware.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_haltest-hal-utils.$(OBJEXT)
+android_haltest_OBJECTS = $(am_android_haltest_OBJECTS)
+android_haltest_LDADD = $(LDADD)
+android_haltest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(android_haltest_CFLAGS) $(CFLAGS) $(android_haltest_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am__android_ipc_tester_SOURCES_DIST = emulator/hciemu.h \
+	emulator/hciemu.c emulator/btdev.h emulator/btdev.c \
+	emulator/bthost.h emulator/bthost.c emulator/smp.c \
+	android/hal-utils.h android/hal-utils.c android/ipc-common.h \
+	android/ipc-tester.c
+@ANDROID_TRUE@am_android_ipc_tester_OBJECTS =  \
+@ANDROID_TRUE@	emulator/android_ipc_tester-hciemu.$(OBJEXT) \
+@ANDROID_TRUE@	emulator/android_ipc_tester-btdev.$(OBJEXT) \
+@ANDROID_TRUE@	emulator/android_ipc_tester-bthost.$(OBJEXT) \
+@ANDROID_TRUE@	emulator/android_ipc_tester-smp.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_ipc_tester-hal-utils.$(OBJEXT) \
+@ANDROID_TRUE@	android/android_ipc_tester-ipc-tester.$(OBJEXT)
+android_ipc_tester_OBJECTS = $(am_android_ipc_tester_OBJECTS)
+@ANDROID_TRUE@android_ipc_tester_DEPENDENCIES =  \
+@ANDROID_TRUE@	lib/libbluetooth-internal.la \
+@ANDROID_TRUE@	src/libshared-glib.la
+android_ipc_tester_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(android_ipc_tester_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am__android_system_emulator_SOURCES_DIST = android/system-emulator.c
+@ANDROID_TRUE@am_android_system_emulator_OBJECTS =  \
+@ANDROID_TRUE@	android/system-emulator.$(OBJEXT)
+android_system_emulator_OBJECTS =  \
+	$(am_android_system_emulator_OBJECTS)
+@ANDROID_TRUE@android_system_emulator_DEPENDENCIES =  \
+@ANDROID_TRUE@	src/libshared-mainloop.la
+am__android_test_ipc_SOURCES_DIST = android/test-ipc.c src/log.h \
+	src/log.c android/ipc-common.h android/ipc.c android/ipc.h
+@ANDROID_TRUE@am_android_test_ipc_OBJECTS =  \
+@ANDROID_TRUE@	android/test-ipc.$(OBJEXT) src/log.$(OBJEXT) \
+@ANDROID_TRUE@	android/ipc.$(OBJEXT)
+android_test_ipc_OBJECTS = $(am_android_test_ipc_OBJECTS)
+@ANDROID_TRUE@android_test_ipc_DEPENDENCIES = src/libshared-glib.la
 am__attrib_gatttool_SOURCES_DIST = attrib/gatttool.c attrib/att.c \
 	attrib/gatt.c attrib/gattrib.c btio/btio.c attrib/gatttool.h \
-	attrib/interactive.c attrib/utils.c src/log.c
-@READLINE_TRUE@@TOOLS_TRUE@am_attrib_gatttool_OBJECTS =  \
-@READLINE_TRUE@@TOOLS_TRUE@	attrib/gatttool.$(OBJEXT) \
-@READLINE_TRUE@@TOOLS_TRUE@	attrib/att.$(OBJEXT) \
-@READLINE_TRUE@@TOOLS_TRUE@	attrib/gatt.$(OBJEXT) \
-@READLINE_TRUE@@TOOLS_TRUE@	attrib/gattrib.$(OBJEXT) \
-@READLINE_TRUE@@TOOLS_TRUE@	btio/btio.$(OBJEXT) \
-@READLINE_TRUE@@TOOLS_TRUE@	attrib/interactive.$(OBJEXT) \
-@READLINE_TRUE@@TOOLS_TRUE@	attrib/utils.$(OBJEXT) \
-@READLINE_TRUE@@TOOLS_TRUE@	src/log.$(OBJEXT)
+	attrib/interactive.c attrib/utils.c src/log.c client/display.c \
+	client/display.h
+@READLINE_TRUE@am_attrib_gatttool_OBJECTS = attrib/gatttool.$(OBJEXT) \
+@READLINE_TRUE@	attrib/att.$(OBJEXT) attrib/gatt.$(OBJEXT) \
+@READLINE_TRUE@	attrib/gattrib.$(OBJEXT) btio/btio.$(OBJEXT) \
+@READLINE_TRUE@	attrib/interactive.$(OBJEXT) \
+@READLINE_TRUE@	attrib/utils.$(OBJEXT) src/log.$(OBJEXT) \
+@READLINE_TRUE@	client/display.$(OBJEXT)
 attrib_gatttool_OBJECTS = $(am_attrib_gatttool_OBJECTS)
-@READLINE_TRUE@@TOOLS_TRUE@attrib_gatttool_DEPENDENCIES =  \
-@READLINE_TRUE@@TOOLS_TRUE@	lib/libbluetooth-private.la
-am__compat_dund_SOURCES_DIST = compat/dund.c compat/dund.h \
-	compat/lib.h compat/sdp.h compat/sdp.c compat/dun.c \
-	compat/msdun.c src/textfile.h src/textfile.c
-@DUND_TRUE@am_compat_dund_OBJECTS = compat/dund.$(OBJEXT) \
-@DUND_TRUE@	compat/sdp.$(OBJEXT) compat/dun.$(OBJEXT) \
-@DUND_TRUE@	compat/msdun.$(OBJEXT) src/textfile.$(OBJEXT)
-compat_dund_OBJECTS = $(am_compat_dund_OBJECTS)
-@DUND_TRUE@compat_dund_DEPENDENCIES = lib/libbluetooth-private.la
-am__compat_hidd_SOURCES_DIST = compat/hidd.c compat/hidd.h \
-	src/uinput.h compat/sdp.h compat/sdp.c compat/fakehid.c \
-	src/textfile.h src/textfile.c
-@HIDD_TRUE@am_compat_hidd_OBJECTS = compat/hidd.$(OBJEXT) \
-@HIDD_TRUE@	compat/sdp.$(OBJEXT) compat/fakehid.$(OBJEXT) \
-@HIDD_TRUE@	src/textfile.$(OBJEXT)
-compat_hidd_OBJECTS = $(am_compat_hidd_OBJECTS)
-@HIDD_TRUE@compat_hidd_DEPENDENCIES = lib/libbluetooth-private.la
-am__compat_pand_SOURCES_DIST = compat/pand.c compat/pand.h \
-	compat/bnep.c compat/sdp.h compat/sdp.c src/textfile.h \
-	src/textfile.c
-@PAND_TRUE@am_compat_pand_OBJECTS = compat/pand.$(OBJEXT) \
-@PAND_TRUE@	compat/bnep.$(OBJEXT) compat/sdp.$(OBJEXT) \
-@PAND_TRUE@	src/textfile.$(OBJEXT)
-compat_pand_OBJECTS = $(am_compat_pand_OBJECTS)
-@PAND_TRUE@compat_pand_DEPENDENCIES = lib/libbluetooth-private.la
-am__cups_bluetooth_SOURCES_DIST = gdbus/gdbus.h gdbus/mainloop.c \
-	gdbus/watch.c gdbus/object.c gdbus/polkit.c cups/main.c \
-	cups/cups.h cups/sdp.c cups/spp.c cups/hcrp.c
-am__objects_3 = gdbus/mainloop.$(OBJEXT) gdbus/watch.$(OBJEXT) \
-	gdbus/object.$(OBJEXT) gdbus/polkit.$(OBJEXT)
-@CUPS_TRUE@am_cups_bluetooth_OBJECTS = $(am__objects_3) \
-@CUPS_TRUE@	cups/main.$(OBJEXT) cups/sdp.$(OBJEXT) \
-@CUPS_TRUE@	cups/spp.$(OBJEXT) cups/hcrp.$(OBJEXT)
-cups_bluetooth_OBJECTS = $(am_cups_bluetooth_OBJECTS)
-@CUPS_TRUE@cups_bluetooth_DEPENDENCIES = lib/libbluetooth-private.la
+@READLINE_TRUE@attrib_gatttool_DEPENDENCIES =  \
+@READLINE_TRUE@	lib/libbluetooth-internal.la \
+@READLINE_TRUE@	src/libshared-glib.la
+am__client_bluetoothctl_SOURCES_DIST = client/main.c client/display.h \
+	client/display.c client/agent.h client/agent.c client/gatt.h \
+	client/gatt.c monitor/uuid.h monitor/uuid.c
+@CLIENT_TRUE@am_client_bluetoothctl_OBJECTS = client/main.$(OBJEXT) \
+@CLIENT_TRUE@	client/display.$(OBJEXT) client/agent.$(OBJEXT) \
+@CLIENT_TRUE@	client/gatt.$(OBJEXT) monitor/uuid.$(OBJEXT)
+client_bluetoothctl_OBJECTS = $(am_client_bluetoothctl_OBJECTS)
+@CLIENT_TRUE@client_bluetoothctl_DEPENDENCIES =  \
+@CLIENT_TRUE@	gdbus/libgdbus-internal.la
+am__emulator_b1ee_SOURCES_DIST = emulator/b1ee.c
+@EXPERIMENTAL_TRUE@am_emulator_b1ee_OBJECTS = emulator/b1ee.$(OBJEXT)
+emulator_b1ee_OBJECTS = $(am_emulator_b1ee_OBJECTS)
+@EXPERIMENTAL_TRUE@emulator_b1ee_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
 am__emulator_btvirt_SOURCES_DIST = emulator/main.c monitor/bt.h \
-	monitor/mainloop.h monitor/mainloop.c emulator/server.h \
+	emulator/serial.h emulator/serial.c emulator/server.h \
 	emulator/server.c emulator/vhci.h emulator/vhci.c \
-	emulator/btdev.h emulator/btdev.c
-@TOOLS_TRUE@am_emulator_btvirt_OBJECTS = emulator/main.$(OBJEXT) \
-@TOOLS_TRUE@	monitor/mainloop.$(OBJEXT) \
-@TOOLS_TRUE@	emulator/server.$(OBJEXT) emulator/vhci.$(OBJEXT) \
-@TOOLS_TRUE@	emulator/btdev.$(OBJEXT)
+	emulator/btdev.h emulator/btdev.c emulator/bthost.h \
+	emulator/bthost.c emulator/smp.c emulator/phy.h emulator/phy.c \
+	emulator/amp.h emulator/amp.c emulator/le.h emulator/le.c
+@EXPERIMENTAL_TRUE@am_emulator_btvirt_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	emulator/main.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/serial.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/server.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/vhci.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/phy.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/amp.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/le.$(OBJEXT)
 emulator_btvirt_OBJECTS = $(am_emulator_btvirt_OBJECTS)
-emulator_btvirt_LDADD = $(LDADD)
-am__mgmt_btmgmt_SOURCES_DIST = mgmt/main.c src/glib-helper.c
-@TOOLS_TRUE@am_mgmt_btmgmt_OBJECTS = mgmt/main.$(OBJEXT) \
-@TOOLS_TRUE@	src/glib-helper.$(OBJEXT)
-mgmt_btmgmt_OBJECTS = $(am_mgmt_btmgmt_OBJECTS)
-@TOOLS_TRUE@mgmt_btmgmt_DEPENDENCIES = lib/libbluetooth-private.la
+@EXPERIMENTAL_TRUE@emulator_btvirt_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+am__emulator_hfp_SOURCES_DIST = emulator/hfp.c
+@EXPERIMENTAL_TRUE@am_emulator_hfp_OBJECTS = emulator/hfp.$(OBJEXT)
+emulator_hfp_OBJECTS = $(am_emulator_hfp_OBJECTS)
+@EXPERIMENTAL_TRUE@emulator_hfp_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
 am__monitor_btmon_SOURCES_DIST = monitor/main.c monitor/bt.h \
-	monitor/mainloop.h monitor/mainloop.c monitor/hcidump.h \
-	monitor/hcidump.c monitor/btsnoop.h monitor/btsnoop.c \
+	monitor/display.h monitor/display.c monitor/hcidump.h \
+	monitor/hcidump.c monitor/ellisys.h monitor/ellisys.c \
 	monitor/control.h monitor/control.c monitor/packet.h \
-	monitor/packet.c
-@TOOLS_TRUE@am_monitor_btmon_OBJECTS = monitor/main.$(OBJEXT) \
-@TOOLS_TRUE@	monitor/mainloop.$(OBJEXT) \
-@TOOLS_TRUE@	monitor/hcidump.$(OBJEXT) \
-@TOOLS_TRUE@	monitor/btsnoop.$(OBJEXT) \
-@TOOLS_TRUE@	monitor/control.$(OBJEXT) monitor/packet.$(OBJEXT)
+	monitor/packet.c monitor/vendor.h monitor/vendor.c \
+	monitor/lmp.h monitor/lmp.c monitor/crc.h monitor/crc.c \
+	monitor/ll.h monitor/ll.c monitor/l2cap.h monitor/l2cap.c \
+	monitor/sdp.h monitor/sdp.c monitor/avctp.h monitor/avctp.c \
+	monitor/rfcomm.h monitor/rfcomm.c monitor/bnep.h \
+	monitor/bnep.c monitor/uuid.h monitor/uuid.c monitor/hwdb.h \
+	monitor/hwdb.c monitor/keys.h monitor/keys.c monitor/analyze.h \
+	monitor/analyze.c
+@MONITOR_TRUE@am_monitor_btmon_OBJECTS = monitor/main.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/display.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/hcidump.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/ellisys.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/control.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/packet.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/vendor.$(OBJEXT) monitor/lmp.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/crc.$(OBJEXT) monitor/ll.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/l2cap.$(OBJEXT) monitor/sdp.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/avctp.$(OBJEXT) monitor/rfcomm.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/bnep.$(OBJEXT) monitor/uuid.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/hwdb.$(OBJEXT) monitor/keys.$(OBJEXT) \
+@MONITOR_TRUE@	monitor/analyze.$(OBJEXT)
 monitor_btmon_OBJECTS = $(am_monitor_btmon_OBJECTS)
-@TOOLS_TRUE@monitor_btmon_DEPENDENCIES = lib/libbluetooth-private.la
-am__sbc_sbcdec_SOURCES_DIST = sbc/sbcdec.c sbc/formats.h
-@SBC_TRUE@am_sbc_sbcdec_OBJECTS = sbc/sbcdec.$(OBJEXT)
-sbc_sbcdec_OBJECTS = $(am_sbc_sbcdec_OBJECTS)
-@SBC_TRUE@sbc_sbcdec_DEPENDENCIES = sbc/libsbc.la
-am__sbc_sbcenc_SOURCES_DIST = sbc/sbcenc.c sbc/formats.h
-@SBC_TRUE@am_sbc_sbcenc_OBJECTS = sbc/sbcenc.$(OBJEXT)
-sbc_sbcenc_OBJECTS = $(am_sbc_sbcenc_OBJECTS)
-@SBC_TRUE@sbc_sbcenc_DEPENDENCIES = sbc/libsbc.la
-sbc_sbcinfo_SOURCES = sbc/sbcinfo.c
-sbc_sbcinfo_OBJECTS = sbc/sbcinfo.$(OBJEXT)
-sbc_sbcinfo_LDADD = $(LDADD)
-sbc_sbctester_SOURCES = sbc/sbctester.c
-sbc_sbctester_OBJECTS = sbc/sbctester.$(OBJEXT)
-sbc_sbctester_DEPENDENCIES =
-am__src_bluetoothd_SOURCES_DIST = gdbus/gdbus.h gdbus/mainloop.c \
-	gdbus/watch.c gdbus/object.c gdbus/polkit.c plugins/pnat.c \
-	audio/main.c audio/manager.h audio/manager.c audio/gateway.h \
-	audio/gateway.c audio/headset.h audio/headset.c \
-	audio/control.h audio/control.c audio/avctp.h audio/avctp.c \
-	audio/avrcp.h audio/avrcp.c audio/device.h audio/device.c \
-	audio/source.h audio/source.c audio/sink.h audio/sink.c \
-	audio/a2dp.h audio/a2dp.c audio/avdtp.h audio/avdtp.c \
-	audio/ipc.h audio/ipc.c audio/unix.h audio/unix.c \
-	audio/media.h audio/media.c audio/transport.h \
-	audio/transport.c audio/telephony.h audio/a2dp-codecs.h \
-	sap/main.c sap/manager.h sap/manager.c sap/server.h \
-	sap/server.c sap/sap.h input/main.c input/manager.h \
-	input/manager.c input/server.h input/server.c input/device.h \
-	input/device.c input/fakehid.c input/fakehid.h serial/main.c \
-	serial/manager.h serial/manager.c serial/proxy.h \
-	serial/proxy.c serial/port.h serial/port.c network/main.c \
-	network/manager.h network/manager.c network/common.h \
-	network/common.c network/server.h network/server.c \
-	network/connection.h network/connection.c plugins/service.c \
-	health/hdp_main.c health/hdp_types.h health/hdp_manager.h \
-	health/hdp_manager.c health/hdp.h health/hdp.c \
-	health/hdp_util.h health/hdp_util.c thermometer/main.c \
-	thermometer/manager.h thermometer/manager.c \
-	thermometer/thermometer.h thermometer/thermometer.c \
-	alert/main.c alert/server.h alert/server.c time/main.c \
-	time/server.h time/server.c plugins/gatt-example.c \
-	proximity/main.c proximity/manager.h proximity/manager.c \
-	proximity/monitor.h proximity/monitor.c proximity/reporter.h \
-	proximity/reporter.c proximity/linkloss.h proximity/linkloss.c \
-	proximity/immalert.h proximity/immalert.c deviceinfo/main.c \
-	deviceinfo/manager.h deviceinfo/manager.c \
-	deviceinfo/deviceinfo.h deviceinfo/deviceinfo.c \
-	plugins/hciops.c plugins/mgmtops.c plugins/hal.c \
-	plugins/formfactor.c plugins/storage.c plugins/adaptername.c \
-	plugins/wiimote.c plugins/maemo6.c plugins/dbusoob.c \
-	attrib/att.h attrib/att-database.h attrib/att.c attrib/gatt.h \
-	attrib/gatt.c attrib/gattrib.h attrib/gattrib.c \
-	attrib/client.h attrib/client.c attrib/gatt-service.h \
+@MONITOR_TRUE@monitor_btmon_DEPENDENCIES =  \
+@MONITOR_TRUE@	lib/libbluetooth-internal.la \
+@MONITOR_TRUE@	src/libshared-mainloop.la
+am__obexd_src_obexd_SOURCES_DIST = btio/btio.h btio/btio.c \
+	gobex/gobex.h gobex/gobex.c gobex/gobex-defs.h \
+	gobex/gobex-defs.c gobex/gobex-packet.c gobex/gobex-packet.h \
+	gobex/gobex-header.c gobex/gobex-header.h \
+	gobex/gobex-transfer.c gobex/gobex-debug.h \
+	gobex/gobex-apparam.c gobex/gobex-apparam.h \
+	obexd/plugins/filesystem.c obexd/plugins/filesystem.h \
+	obexd/plugins/bluetooth.c obexd/plugins/pcsuite.c \
+	obexd/plugins/opp.c obexd/plugins/ftp.c obexd/plugins/ftp.h \
+	obexd/plugins/irmc.c obexd/plugins/pbap.c \
+	obexd/plugins/vcard.h obexd/plugins/vcard.c \
+	obexd/plugins/phonebook.h obexd/plugins/phonebook-dummy.c \
+	obexd/plugins/mas.c obexd/src/map_ap.h \
+	obexd/plugins/messages.h obexd/plugins/messages-dummy.c \
+	obexd/client/mns.c obexd/client/map-event.h obexd/src/main.c \
+	obexd/src/obexd.h obexd/src/plugin.h obexd/src/plugin.c \
+	obexd/src/log.h obexd/src/log.c obexd/src/manager.h \
+	obexd/src/manager.c obexd/src/obex.h obexd/src/obex.c \
+	obexd/src/obex-priv.h obexd/src/mimetype.h \
+	obexd/src/mimetype.c obexd/src/service.h obexd/src/service.c \
+	obexd/src/transport.h obexd/src/transport.c obexd/src/server.h \
+	obexd/src/server.c obexd/client/manager.h \
+	obexd/client/manager.c obexd/client/session.h \
+	obexd/client/session.c obexd/client/bluetooth.h \
+	obexd/client/bluetooth.c obexd/client/sync.h \
+	obexd/client/sync.c obexd/client/pbap.h obexd/client/pbap.c \
+	obexd/client/ftp.h obexd/client/ftp.c obexd/client/opp.h \
+	obexd/client/opp.c obexd/client/map.h obexd/client/map.c \
+	obexd/client/map-event.c obexd/client/transfer.h \
+	obexd/client/transfer.c obexd/client/transport.h \
+	obexd/client/transport.c obexd/client/dbus.h \
+	obexd/client/dbus.c obexd/client/driver.h \
+	obexd/client/driver.c
+am__objects_5 = btio/obexd-btio.$(OBJEXT)
+am__objects_6 = gobex/obexd-gobex.$(OBJEXT) \
+	gobex/obexd-gobex-defs.$(OBJEXT) \
+	gobex/obexd-gobex-packet.$(OBJEXT) \
+	gobex/obexd-gobex-header.$(OBJEXT) \
+	gobex/obexd-gobex-transfer.$(OBJEXT) \
+	gobex/obexd-gobex-apparam.$(OBJEXT)
+@EXPERIMENTAL_TRUE@am__objects_7 =  \
+@EXPERIMENTAL_TRUE@	obexd/plugins/obexd-pcsuite.$(OBJEXT)
+@OBEX_TRUE@am__objects_8 = obexd/plugins/obexd-irmc.$(OBJEXT) \
+@OBEX_TRUE@	obexd/plugins/obexd-pbap.$(OBJEXT) \
+@OBEX_TRUE@	obexd/plugins/obexd-vcard.$(OBJEXT) \
+@OBEX_TRUE@	obexd/plugins/obexd-phonebook-dummy.$(OBJEXT)
+am__objects_9 = obexd/plugins/obexd-filesystem.$(OBJEXT) \
+	obexd/plugins/obexd-bluetooth.$(OBJEXT) $(am__objects_7) \
+	obexd/plugins/obexd-opp.$(OBJEXT) \
+	obexd/plugins/obexd-ftp.$(OBJEXT) $(am__objects_8) \
+	obexd/plugins/obexd-mas.$(OBJEXT) \
+	obexd/plugins/obexd-messages-dummy.$(OBJEXT) \
+	obexd/client/obexd-mns.$(OBJEXT)
+am_obexd_src_obexd_OBJECTS = $(am__objects_5) $(am__objects_6) \
+	$(am__objects_9) obexd/src/obexd-main.$(OBJEXT) \
+	obexd/src/obexd-plugin.$(OBJEXT) obexd/src/obexd-log.$(OBJEXT) \
+	obexd/src/obexd-manager.$(OBJEXT) \
+	obexd/src/obexd-obex.$(OBJEXT) \
+	obexd/src/obexd-mimetype.$(OBJEXT) \
+	obexd/src/obexd-service.$(OBJEXT) \
+	obexd/src/obexd-transport.$(OBJEXT) \
+	obexd/src/obexd-server.$(OBJEXT) \
+	obexd/client/obexd-manager.$(OBJEXT) \
+	obexd/client/obexd-session.$(OBJEXT) \
+	obexd/client/obexd-bluetooth.$(OBJEXT) \
+	obexd/client/obexd-sync.$(OBJEXT) \
+	obexd/client/obexd-pbap.$(OBJEXT) \
+	obexd/client/obexd-ftp.$(OBJEXT) \
+	obexd/client/obexd-opp.$(OBJEXT) \
+	obexd/client/obexd-map.$(OBJEXT) \
+	obexd/client/obexd-map-event.$(OBJEXT) \
+	obexd/client/obexd-transfer.$(OBJEXT) \
+	obexd/client/obexd-transport.$(OBJEXT) \
+	obexd/client/obexd-dbus.$(OBJEXT) \
+	obexd/client/obexd-driver.$(OBJEXT)
+am__objects_10 = $(am__objects_1)
+nodist_obexd_src_obexd_OBJECTS = $(am__objects_10)
+obexd_src_obexd_OBJECTS = $(am_obexd_src_obexd_OBJECTS) \
+	$(nodist_obexd_src_obexd_OBJECTS)
+obexd_src_obexd_DEPENDENCIES = lib/libbluetooth-internal.la \
+	gdbus/libgdbus-internal.la
+obexd_src_obexd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(obexd_src_obexd_CFLAGS) $(CFLAGS) $(obexd_src_obexd_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am__peripheral_btsensor_SOURCES_DIST = peripheral/main.c \
+	peripheral/efivars.h peripheral/efivars.c peripheral/attach.h \
+	peripheral/attach.c peripheral/log.h peripheral/log.c \
+	peripheral/gap.h peripheral/gap.c peripheral/gatt.h \
+	peripheral/gatt.c
+@EXPERIMENTAL_TRUE@am_peripheral_btsensor_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	peripheral/main.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	peripheral/efivars.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	peripheral/attach.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	peripheral/log.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	peripheral/gap.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	peripheral/gatt.$(OBJEXT)
+peripheral_btsensor_OBJECTS = $(am_peripheral_btsensor_OBJECTS)
+@EXPERIMENTAL_TRUE@peripheral_btsensor_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+am__profiles_cups_bluetooth_SOURCES_DIST = profiles/cups/main.c \
+	profiles/cups/cups.h profiles/cups/sdp.c profiles/cups/spp.c \
+	profiles/cups/hcrp.c
+@CUPS_TRUE@am_profiles_cups_bluetooth_OBJECTS =  \
+@CUPS_TRUE@	profiles/cups/main.$(OBJEXT) \
+@CUPS_TRUE@	profiles/cups/sdp.$(OBJEXT) \
+@CUPS_TRUE@	profiles/cups/spp.$(OBJEXT) \
+@CUPS_TRUE@	profiles/cups/hcrp.$(OBJEXT)
+profiles_cups_bluetooth_OBJECTS =  \
+	$(am_profiles_cups_bluetooth_OBJECTS)
+@CUPS_TRUE@profiles_cups_bluetooth_DEPENDENCIES =  \
+@CUPS_TRUE@	lib/libbluetooth-internal.la \
+@CUPS_TRUE@	gdbus/libgdbus-internal.la
+am__profiles_iap_iapd_SOURCES_DIST = profiles/iap/main.c
+@EXPERIMENTAL_TRUE@am_profiles_iap_iapd_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	profiles/iap/main.$(OBJEXT)
+profiles_iap_iapd_OBJECTS = $(am_profiles_iap_iapd_OBJECTS)
+@EXPERIMENTAL_TRUE@profiles_iap_iapd_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	gdbus/libgdbus-internal.la
+am__src_bluetoothd_SOURCES_DIST = plugins/hostname.c plugins/wiimote.c \
+	plugins/autopair.c plugins/policy.c plugins/gatt-example.c \
+	plugins/neard.c profiles/sap/main.c profiles/sap/manager.h \
+	profiles/sap/manager.c profiles/sap/server.h \
+	profiles/sap/server.c profiles/sap/sap.h \
+	profiles/sap/sap-dummy.c profiles/audio/source.h \
+	profiles/audio/source.c profiles/audio/sink.h \
+	profiles/audio/sink.c profiles/audio/a2dp.h \
+	profiles/audio/a2dp.c profiles/audio/avdtp.h \
+	profiles/audio/avdtp.c profiles/audio/media.h \
+	profiles/audio/media.c profiles/audio/transport.h \
+	profiles/audio/transport.c profiles/audio/a2dp-codecs.h \
+	profiles/audio/control.h profiles/audio/control.c \
+	profiles/audio/avctp.h profiles/audio/avctp.c \
+	profiles/audio/avrcp.h profiles/audio/avrcp.c \
+	profiles/audio/player.h profiles/audio/player.c \
+	profiles/network/manager.c profiles/network/bnep.h \
+	profiles/network/bnep.c profiles/network/server.h \
+	profiles/network/server.c profiles/network/connection.h \
+	profiles/network/connection.c profiles/input/manager.c \
+	profiles/input/server.h profiles/input/server.c \
+	profiles/input/device.h profiles/input/device.c \
+	profiles/input/hidp_defs.h profiles/input/hog.c \
+	profiles/input/uhid_copy.h profiles/input/suspend.h \
+	profiles/input/suspend-none.c profiles/health/mcap.h \
+	profiles/health/mcap.c profiles/health/hdp_main.c \
+	profiles/health/hdp_types.h profiles/health/hdp_manager.h \
+	profiles/health/hdp_manager.c profiles/health/hdp.h \
+	profiles/health/hdp.c profiles/health/hdp_util.h \
+	profiles/health/hdp_util.c profiles/gap/gas.c \
+	profiles/scanparam/scan.c profiles/deviceinfo/deviceinfo.c \
+	profiles/alert/server.c profiles/time/server.c \
+	profiles/proximity/main.c profiles/proximity/manager.h \
+	profiles/proximity/manager.c profiles/proximity/monitor.h \
+	profiles/proximity/monitor.c profiles/proximity/reporter.h \
+	profiles/proximity/reporter.c profiles/proximity/linkloss.h \
+	profiles/proximity/linkloss.c profiles/proximity/immalert.h \
+	profiles/proximity/immalert.c \
+	profiles/thermometer/thermometer.c \
+	profiles/heartrate/heartrate.c \
+	profiles/cyclingspeed/cyclingspeed.c attrib/att.h \
+	attrib/att-database.h attrib/att.c attrib/gatt.h attrib/gatt.c \
+	attrib/gattrib.h attrib/gattrib.c attrib/gatt-service.h \
 	attrib/gatt-service.c btio/btio.h btio/btio.c \
-	health/mcap_lib.h health/mcap_internal.h health/mcap.h \
-	health/mcap.c health/mcap_sync.c src/bluetooth.ver src/main.c \
-	src/log.h src/log.c src/rfkill.c src/hcid.h src/sdpd.h \
+	src/bluetooth.ver src/main.c src/log.h src/log.c src/systemd.h \
+	src/systemd.c src/rfkill.c src/hcid.h src/sdpd.h \
 	src/sdpd-server.c src/sdpd-request.c src/sdpd-service.c \
 	src/sdpd-database.c src/attrib-server.h src/attrib-server.c \
-	src/sdp-xml.h src/sdp-xml.c src/sdp-client.h src/sdp-client.c \
-	src/textfile.h src/textfile.c src/glib-helper.h \
-	src/glib-helper.c src/oui.h src/oui.c src/uinput.h src/ppoll.h \
-	src/plugin.h src/plugin.c src/storage.h src/storage.c \
-	src/agent.h src/agent.c src/error.h src/error.c src/manager.h \
-	src/manager.c src/adapter.h src/adapter.c src/device.h \
+	src/gatt-database.h src/gatt-database.c src/sdp-xml.h \
+	src/sdp-xml.c src/sdp-client.h src/sdp-client.c src/textfile.h \
+	src/textfile.c src/uuid-helper.h src/uuid-helper.c \
+	src/uinput.h src/plugin.h src/plugin.c src/storage.h \
+	src/storage.c src/advertising.h src/advertising.c src/agent.h \
+	src/agent.c src/error.h src/error.c src/adapter.h \
+	src/adapter.c src/profile.h src/profile.c src/service.h \
+	src/service.c src/gatt-client.h src/gatt-client.c src/device.h \
 	src/device.c src/attio.h src/dbus-common.c src/dbus-common.h \
-	src/event.h src/event.c src/oob.h src/oob.c src/eir.h \
-	src/eir.c
-am__objects_4 = gdbus/bluetoothd-mainloop.$(OBJEXT) \
-	gdbus/bluetoothd-watch.$(OBJEXT) \
-	gdbus/bluetoothd-object.$(OBJEXT) \
-	gdbus/bluetoothd-polkit.$(OBJEXT)
-@PNATPLUGIN_TRUE@am__objects_5 = plugins/bluetoothd-pnat.$(OBJEXT)
-@AUDIOPLUGIN_TRUE@am__objects_6 = audio/bluetoothd-main.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-manager.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-gateway.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-headset.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-control.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-avctp.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-avrcp.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-device.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-source.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-sink.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-a2dp.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-avdtp.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-ipc.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-unix.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-media.$(OBJEXT) \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-transport.$(OBJEXT)
-@SAPPLUGIN_TRUE@am__objects_7 = sap/bluetoothd-main.$(OBJEXT) \
-@SAPPLUGIN_TRUE@	sap/bluetoothd-manager.$(OBJEXT) \
-@SAPPLUGIN_TRUE@	sap/bluetoothd-server.$(OBJEXT)
-@INPUTPLUGIN_TRUE@am__objects_8 = input/bluetoothd-main.$(OBJEXT) \
-@INPUTPLUGIN_TRUE@	input/bluetoothd-manager.$(OBJEXT) \
-@INPUTPLUGIN_TRUE@	input/bluetoothd-server.$(OBJEXT) \
-@INPUTPLUGIN_TRUE@	input/bluetoothd-device.$(OBJEXT) \
-@INPUTPLUGIN_TRUE@	input/bluetoothd-fakehid.$(OBJEXT)
-@SERIALPLUGIN_TRUE@am__objects_9 = serial/bluetoothd-main.$(OBJEXT) \
-@SERIALPLUGIN_TRUE@	serial/bluetoothd-manager.$(OBJEXT) \
-@SERIALPLUGIN_TRUE@	serial/bluetoothd-proxy.$(OBJEXT) \
-@SERIALPLUGIN_TRUE@	serial/bluetoothd-port.$(OBJEXT)
-@NETWORKPLUGIN_TRUE@am__objects_10 =  \
-@NETWORKPLUGIN_TRUE@	network/bluetoothd-main.$(OBJEXT) \
-@NETWORKPLUGIN_TRUE@	network/bluetoothd-manager.$(OBJEXT) \
-@NETWORKPLUGIN_TRUE@	network/bluetoothd-common.$(OBJEXT) \
-@NETWORKPLUGIN_TRUE@	network/bluetoothd-server.$(OBJEXT) \
-@NETWORKPLUGIN_TRUE@	network/bluetoothd-connection.$(OBJEXT)
-@SERVICEPLUGIN_TRUE@am__objects_11 =  \
-@SERVICEPLUGIN_TRUE@	plugins/bluetoothd-service.$(OBJEXT)
-@HEALTHPLUGIN_TRUE@am__objects_12 =  \
-@HEALTHPLUGIN_TRUE@	health/bluetoothd-hdp_main.$(OBJEXT) \
-@HEALTHPLUGIN_TRUE@	health/bluetoothd-hdp_manager.$(OBJEXT) \
-@HEALTHPLUGIN_TRUE@	health/bluetoothd-hdp.$(OBJEXT) \
-@HEALTHPLUGIN_TRUE@	health/bluetoothd-hdp_util.$(OBJEXT)
-@GATTMODULES_TRUE@am__objects_13 =  \
-@GATTMODULES_TRUE@	thermometer/bluetoothd-main.$(OBJEXT) \
-@GATTMODULES_TRUE@	thermometer/bluetoothd-manager.$(OBJEXT) \
-@GATTMODULES_TRUE@	thermometer/bluetoothd-thermometer.$(OBJEXT) \
-@GATTMODULES_TRUE@	alert/bluetoothd-main.$(OBJEXT) \
-@GATTMODULES_TRUE@	alert/bluetoothd-server.$(OBJEXT) \
-@GATTMODULES_TRUE@	time/bluetoothd-main.$(OBJEXT) \
-@GATTMODULES_TRUE@	time/bluetoothd-server.$(OBJEXT) \
-@GATTMODULES_TRUE@	plugins/bluetoothd-gatt-example.$(OBJEXT) \
-@GATTMODULES_TRUE@	proximity/bluetoothd-main.$(OBJEXT) \
-@GATTMODULES_TRUE@	proximity/bluetoothd-manager.$(OBJEXT) \
-@GATTMODULES_TRUE@	proximity/bluetoothd-monitor.$(OBJEXT) \
-@GATTMODULES_TRUE@	proximity/bluetoothd-reporter.$(OBJEXT) \
-@GATTMODULES_TRUE@	proximity/bluetoothd-linkloss.$(OBJEXT) \
-@GATTMODULES_TRUE@	proximity/bluetoothd-immalert.$(OBJEXT) \
-@GATTMODULES_TRUE@	deviceinfo/bluetoothd-main.$(OBJEXT) \
-@GATTMODULES_TRUE@	deviceinfo/bluetoothd-manager.$(OBJEXT) \
-@GATTMODULES_TRUE@	deviceinfo/bluetoothd-deviceinfo.$(OBJEXT)
-@HAL_TRUE@am__objects_14 = plugins/bluetoothd-hal.$(OBJEXT)
-@HAL_FALSE@am__objects_15 = plugins/bluetoothd-formfactor.$(OBJEXT)
-@WIIMOTEPLUGIN_TRUE@am__objects_16 =  \
-@WIIMOTEPLUGIN_TRUE@	plugins/bluetoothd-wiimote.$(OBJEXT)
-@MAEMO6PLUGIN_TRUE@am__objects_17 =  \
-@MAEMO6PLUGIN_TRUE@	plugins/bluetoothd-maemo6.$(OBJEXT)
-@DBUSOOBPLUGIN_TRUE@am__objects_18 =  \
-@DBUSOOBPLUGIN_TRUE@	plugins/bluetoothd-dbusoob.$(OBJEXT)
-am__objects_19 = $(am__objects_5) $(am__objects_6) $(am__objects_7) \
-	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
-	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
-	plugins/bluetoothd-hciops.$(OBJEXT) \
-	plugins/bluetoothd-mgmtops.$(OBJEXT) $(am__objects_14) \
-	$(am__objects_15) plugins/bluetoothd-storage.$(OBJEXT) \
-	plugins/bluetoothd-adaptername.$(OBJEXT) $(am__objects_16) \
-	$(am__objects_17) $(am__objects_18)
-am__objects_20 = attrib/bluetoothd-att.$(OBJEXT) \
+	src/eir.h src/eir.c
+@MAINTAINER_MODE_TRUE@am__objects_11 = plugins/bluetoothd-gatt-example.$(OBJEXT)
+@EXPERIMENTAL_TRUE@am__objects_12 =  \
+@EXPERIMENTAL_TRUE@	plugins/bluetoothd-neard.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/sap/bluetoothd-main.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/sap/bluetoothd-manager.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/sap/bluetoothd-server.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/sap/bluetoothd-sap-dummy.$(OBJEXT)
+@EXPERIMENTAL_TRUE@am__objects_13 =  \
+@EXPERIMENTAL_TRUE@	profiles/health/bluetoothd-mcap.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/health/bluetoothd-hdp_main.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/health/bluetoothd-hdp_manager.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/health/bluetoothd-hdp.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/health/bluetoothd-hdp_util.$(OBJEXT)
+@EXPERIMENTAL_TRUE@am__objects_14 =  \
+@EXPERIMENTAL_TRUE@	profiles/alert/bluetoothd-server.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/time/bluetoothd-server.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/proximity/bluetoothd-main.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/proximity/bluetoothd-manager.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/proximity/bluetoothd-monitor.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/proximity/bluetoothd-reporter.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/proximity/bluetoothd-linkloss.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/proximity/bluetoothd-immalert.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/thermometer/bluetoothd-thermometer.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/heartrate/bluetoothd-heartrate.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/cyclingspeed/bluetoothd-cyclingspeed.$(OBJEXT)
+am__objects_15 = plugins/bluetoothd-hostname.$(OBJEXT) \
+	plugins/bluetoothd-wiimote.$(OBJEXT) \
+	plugins/bluetoothd-autopair.$(OBJEXT) \
+	plugins/bluetoothd-policy.$(OBJEXT) $(am__objects_11) \
+	$(am__objects_12) profiles/audio/bluetoothd-source.$(OBJEXT) \
+	profiles/audio/bluetoothd-sink.$(OBJEXT) \
+	profiles/audio/bluetoothd-a2dp.$(OBJEXT) \
+	profiles/audio/bluetoothd-avdtp.$(OBJEXT) \
+	profiles/audio/bluetoothd-media.$(OBJEXT) \
+	profiles/audio/bluetoothd-transport.$(OBJEXT) \
+	profiles/audio/bluetoothd-control.$(OBJEXT) \
+	profiles/audio/bluetoothd-avctp.$(OBJEXT) \
+	profiles/audio/bluetoothd-avrcp.$(OBJEXT) \
+	profiles/audio/bluetoothd-player.$(OBJEXT) \
+	profiles/network/bluetoothd-manager.$(OBJEXT) \
+	profiles/network/bluetoothd-bnep.$(OBJEXT) \
+	profiles/network/bluetoothd-server.$(OBJEXT) \
+	profiles/network/bluetoothd-connection.$(OBJEXT) \
+	profiles/input/bluetoothd-manager.$(OBJEXT) \
+	profiles/input/bluetoothd-server.$(OBJEXT) \
+	profiles/input/bluetoothd-device.$(OBJEXT) \
+	profiles/input/bluetoothd-hog.$(OBJEXT) \
+	profiles/input/bluetoothd-suspend-none.$(OBJEXT) \
+	$(am__objects_13) profiles/gap/bluetoothd-gas.$(OBJEXT) \
+	profiles/scanparam/bluetoothd-scan.$(OBJEXT) \
+	profiles/deviceinfo/bluetoothd-deviceinfo.$(OBJEXT) \
+	$(am__objects_14)
+am__objects_16 = attrib/bluetoothd-att.$(OBJEXT) \
 	attrib/bluetoothd-gatt.$(OBJEXT) \
 	attrib/bluetoothd-gattrib.$(OBJEXT) \
-	attrib/bluetoothd-client.$(OBJEXT) \
 	attrib/bluetoothd-gatt-service.$(OBJEXT)
-am__objects_21 = btio/bluetoothd-btio.$(OBJEXT)
-@MCAP_TRUE@am__objects_22 = health/bluetoothd-mcap.$(OBJEXT) \
-@MCAP_TRUE@	health/bluetoothd-mcap_sync.$(OBJEXT)
-am__objects_23 = $(am__objects_22)
-am_src_bluetoothd_OBJECTS = $(am__objects_4) $(am__objects_19) \
-	$(am__objects_20) $(am__objects_21) $(am__objects_23) \
-	src/bluetoothd-main.$(OBJEXT) src/bluetoothd-log.$(OBJEXT) \
+am__objects_17 = btio/bluetoothd-btio.$(OBJEXT)
+am_src_bluetoothd_OBJECTS = $(am__objects_15) $(am__objects_16) \
+	$(am__objects_17) src/bluetoothd-main.$(OBJEXT) \
+	src/bluetoothd-log.$(OBJEXT) src/bluetoothd-systemd.$(OBJEXT) \
 	src/bluetoothd-rfkill.$(OBJEXT) \
 	src/bluetoothd-sdpd-server.$(OBJEXT) \
 	src/bluetoothd-sdpd-request.$(OBJEXT) \
 	src/bluetoothd-sdpd-service.$(OBJEXT) \
 	src/bluetoothd-sdpd-database.$(OBJEXT) \
 	src/bluetoothd-attrib-server.$(OBJEXT) \
+	src/bluetoothd-gatt-database.$(OBJEXT) \
 	src/bluetoothd-sdp-xml.$(OBJEXT) \
 	src/bluetoothd-sdp-client.$(OBJEXT) \
 	src/bluetoothd-textfile.$(OBJEXT) \
-	src/bluetoothd-glib-helper.$(OBJEXT) \
-	src/bluetoothd-oui.$(OBJEXT) src/bluetoothd-plugin.$(OBJEXT) \
+	src/bluetoothd-uuid-helper.$(OBJEXT) \
+	src/bluetoothd-plugin.$(OBJEXT) \
 	src/bluetoothd-storage.$(OBJEXT) \
+	src/bluetoothd-advertising.$(OBJEXT) \
 	src/bluetoothd-agent.$(OBJEXT) src/bluetoothd-error.$(OBJEXT) \
-	src/bluetoothd-manager.$(OBJEXT) \
 	src/bluetoothd-adapter.$(OBJEXT) \
+	src/bluetoothd-profile.$(OBJEXT) \
+	src/bluetoothd-service.$(OBJEXT) \
+	src/bluetoothd-gatt-client.$(OBJEXT) \
 	src/bluetoothd-device.$(OBJEXT) \
 	src/bluetoothd-dbus-common.$(OBJEXT) \
-	src/bluetoothd-event.$(OBJEXT) src/bluetoothd-oob.$(OBJEXT) \
 	src/bluetoothd-eir.$(OBJEXT)
-@AUDIOPLUGIN_TRUE@am__objects_24 =  \
-@AUDIOPLUGIN_TRUE@	audio/bluetoothd-telephony.$(OBJEXT)
-@SAPPLUGIN_TRUE@am__objects_25 = sap/bluetoothd-sap.$(OBJEXT)
-am__objects_26 = $(am__objects_24) $(am__objects_25)
-am__objects_27 = $(am__objects_26)
-nodist_src_bluetoothd_OBJECTS = $(am__objects_27)
+nodist_src_bluetoothd_OBJECTS = $(am__objects_10)
 src_bluetoothd_OBJECTS = $(am_src_bluetoothd_OBJECTS) \
 	$(nodist_src_bluetoothd_OBJECTS)
 src_bluetoothd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(src_bluetoothd_CFLAGS) $(CFLAGS) $(src_bluetoothd_LDFLAGS) \
 	$(LDFLAGS) -o $@
-test_agent_SOURCES = test/agent.c
-test_agent_OBJECTS = test/agent.$(OBJEXT)
-test_agent_DEPENDENCIES =
-test_attest_SOURCES = test/attest.c
-test_attest_OBJECTS = test/attest.$(OBJEXT)
-@TEST_TRUE@test_attest_DEPENDENCIES = lib/libbluetooth-private.la
-test_avtest_SOURCES = test/avtest.c
-test_avtest_OBJECTS = test/avtest.$(OBJEXT)
-@TEST_TRUE@test_avtest_DEPENDENCIES = lib/libbluetooth-private.la
-am__test_bdaddr_SOURCES_DIST = test/bdaddr.c src/oui.h src/oui.c
-@TEST_TRUE@am_test_bdaddr_OBJECTS = test/bdaddr.$(OBJEXT) \
-@TEST_TRUE@	src/oui.$(OBJEXT)
-test_bdaddr_OBJECTS = $(am_test_bdaddr_OBJECTS)
-@TEST_TRUE@test_bdaddr_DEPENDENCIES = lib/libbluetooth-private.la
-am__test_btiotest_SOURCES_DIST = test/btiotest.c btio/btio.h \
-	btio/btio.c
-@TEST_TRUE@am_test_btiotest_OBJECTS = test/btiotest.$(OBJEXT) \
-@TEST_TRUE@	btio/btio.$(OBJEXT)
-test_btiotest_OBJECTS = $(am_test_btiotest_OBJECTS)
-@TEST_TRUE@test_btiotest_DEPENDENCIES = lib/libbluetooth-private.la
-test_gaptest_SOURCES = test/gaptest.c
-test_gaptest_OBJECTS = test/gaptest.$(OBJEXT)
-test_gaptest_DEPENDENCIES =
-test_hciemu_SOURCES = test/hciemu.c
-test_hciemu_OBJECTS = test/hciemu.$(OBJEXT)
-@TEST_TRUE@test_hciemu_DEPENDENCIES = lib/libbluetooth-private.la
-test_hstest_SOURCES = test/hstest.c
-test_hstest_OBJECTS = test/hstest.$(OBJEXT)
-@TEST_TRUE@test_hstest_DEPENDENCIES = lib/libbluetooth-private.la
-am__test_ipctest_SOURCES_DIST = test/ipctest.c audio/ipc.h audio/ipc.c
-@TEST_TRUE@am_test_ipctest_OBJECTS = test/ipctest.$(OBJEXT) \
-@TEST_TRUE@	audio/ipc.$(OBJEXT)
-test_ipctest_OBJECTS = $(am_test_ipctest_OBJECTS)
-@TEST_TRUE@test_ipctest_DEPENDENCIES = sbc/libsbc.la
-test_l2test_SOURCES = test/l2test.c
-test_l2test_OBJECTS = test/l2test.$(OBJEXT)
-@TEST_TRUE@test_l2test_DEPENDENCIES = lib/libbluetooth-private.la
-test_lmptest_SOURCES = test/lmptest.c
-test_lmptest_OBJECTS = test/lmptest.$(OBJEXT)
-@TEST_TRUE@test_lmptest_DEPENDENCIES = lib/libbluetooth-private.la
-am__test_mpris_player_SOURCES_DIST = test/mpris-player.c
-@TEST_TRUE@am_test_mpris_player_OBJECTS = test/mpris-player.$(OBJEXT)
-test_mpris_player_OBJECTS = $(am_test_mpris_player_OBJECTS)
-test_mpris_player_DEPENDENCIES =
-test_rctest_SOURCES = test/rctest.c
-test_rctest_OBJECTS = test/rctest.$(OBJEXT)
-@TEST_TRUE@test_rctest_DEPENDENCIES = lib/libbluetooth-private.la
-test_scotest_SOURCES = test/scotest.c
-test_scotest_OBJECTS = test/scotest.$(OBJEXT)
-@TEST_TRUE@test_scotest_DEPENDENCIES = lib/libbluetooth-private.la
-test_sdptest_SOURCES = test/sdptest.c
-test_sdptest_OBJECTS = test/sdptest.$(OBJEXT)
-@TEST_TRUE@test_sdptest_DEPENDENCIES = lib/libbluetooth-private.la
-am__test_test_textfile_SOURCES_DIST = test/test-textfile.c \
-	src/textfile.h src/textfile.c
-@TEST_TRUE@am_test_test_textfile_OBJECTS =  \
-@TEST_TRUE@	test/test-textfile.$(OBJEXT) src/textfile.$(OBJEXT)
-test_test_textfile_OBJECTS = $(am_test_test_textfile_OBJECTS)
-test_test_textfile_LDADD = $(LDADD)
-am__test_uuidtest_SOURCES_DIST = test/uuidtest.c
-@TEST_TRUE@am_test_uuidtest_OBJECTS = test/uuidtest.$(OBJEXT)
-test_uuidtest_OBJECTS = $(am_test_uuidtest_OBJECTS)
-@TEST_TRUE@test_uuidtest_DEPENDENCIES = lib/libbluetooth-private.la
-tools_avctrl_SOURCES = tools/avctrl.c
-tools_avctrl_OBJECTS = tools/avctrl.$(OBJEXT)
-tools_avctrl_DEPENDENCIES =
+am__tools_3dsp_SOURCES_DIST = tools/3dsp.c monitor/bt.h
+@EXPERIMENTAL_TRUE@am_tools_3dsp_OBJECTS = tools/3dsp.$(OBJEXT)
+tools_3dsp_OBJECTS = $(am_tools_3dsp_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_3dsp_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+tools_amptest_SOURCES = tools/amptest.c
+tools_amptest_OBJECTS = tools/amptest.$(OBJEXT)
+@EXPERIMENTAL_TRUE@tools_amptest_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
 tools_avinfo_SOURCES = tools/avinfo.c
 tools_avinfo_OBJECTS = tools/avinfo.$(OBJEXT)
-@TOOLS_TRUE@tools_avinfo_DEPENDENCIES = lib/libbluetooth-private.la
+@EXPERIMENTAL_TRUE@tools_avinfo_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+tools_avtest_SOURCES = tools/avtest.c
+tools_avtest_OBJECTS = tools/avtest.$(OBJEXT)
+@EXPERIMENTAL_TRUE@tools_avtest_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
 am__tools_bccmd_SOURCES_DIST = tools/bccmd.c tools/csr.h tools/csr.c \
-	tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \
-	tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c tools/csr_usb.c
-@BCCMD_TRUE@@USB_TRUE@am__objects_28 = tools/csr_usb.$(OBJEXT)
-@BCCMD_TRUE@am_tools_bccmd_OBJECTS = tools/bccmd.$(OBJEXT) \
-@BCCMD_TRUE@	tools/csr.$(OBJEXT) tools/csr_hci.$(OBJEXT) \
-@BCCMD_TRUE@	tools/csr_h4.$(OBJEXT) tools/csr_3wire.$(OBJEXT) \
-@BCCMD_TRUE@	tools/csr_bcsp.$(OBJEXT) tools/ubcsp.$(OBJEXT) \
-@BCCMD_TRUE@	$(am__objects_28)
+	tools/csr_hci.c tools/csr_usb.c tools/csr_h4.c \
+	tools/csr_3wire.c tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
+@TOOLS_TRUE@am_tools_bccmd_OBJECTS = tools/bccmd.$(OBJEXT) \
+@TOOLS_TRUE@	tools/csr.$(OBJEXT) tools/csr_hci.$(OBJEXT) \
+@TOOLS_TRUE@	tools/csr_usb.$(OBJEXT) tools/csr_h4.$(OBJEXT) \
+@TOOLS_TRUE@	tools/csr_3wire.$(OBJEXT) tools/csr_bcsp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/ubcsp.$(OBJEXT)
 tools_bccmd_OBJECTS = $(am_tools_bccmd_OBJECTS)
-am__DEPENDENCIES_1 =
-@BCCMD_TRUE@tools_bccmd_DEPENDENCIES = lib/libbluetooth-private.la \
-@BCCMD_TRUE@	$(am__DEPENDENCIES_1)
+@TOOLS_TRUE@tools_bccmd_DEPENDENCIES = lib/libbluetooth-internal.la
+am__tools_bdaddr_SOURCES_DIST = tools/bdaddr.c src/oui.h src/oui.c
+@EXPERIMENTAL_TRUE@am_tools_bdaddr_OBJECTS = tools/bdaddr.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	src/oui.$(OBJEXT)
+tools_bdaddr_OBJECTS = $(am_tools_bdaddr_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_bdaddr_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+am__tools_bluemoon_SOURCES_DIST = tools/bluemoon.c monitor/bt.h
+@TOOLS_TRUE@am_tools_bluemoon_OBJECTS = tools/bluemoon.$(OBJEXT)
+tools_bluemoon_OBJECTS = $(am_tools_bluemoon_OBJECTS)
+@TOOLS_TRUE@tools_bluemoon_DEPENDENCIES = src/libshared-mainloop.la
+am__tools_bluetooth_player_SOURCES_DIST = tools/bluetooth-player.c \
+	client/display.h client/display.c
+@READLINE_TRUE@am_tools_bluetooth_player_OBJECTS =  \
+@READLINE_TRUE@	tools/bluetooth-player.$(OBJEXT) \
+@READLINE_TRUE@	client/display.$(OBJEXT)
+tools_bluetooth_player_OBJECTS = $(am_tools_bluetooth_player_OBJECTS)
+@READLINE_TRUE@tools_bluetooth_player_DEPENDENCIES =  \
+@READLINE_TRUE@	gdbus/libgdbus-internal.la
+am__tools_bnep_tester_SOURCES_DIST = tools/bnep-tester.c monitor/bt.h \
+	emulator/hciemu.h emulator/hciemu.c emulator/btdev.h \
+	emulator/btdev.c emulator/bthost.h emulator/bthost.c \
+	emulator/smp.c
+@EXPERIMENTAL_TRUE@am_tools_bnep_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/bnep-tester.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hciemu.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT)
+tools_bnep_tester_OBJECTS = $(am_tools_bnep_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_bnep_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
+am__tools_bneptest_SOURCES_DIST = tools/bneptest.c btio/btio.h \
+	btio/btio.c src/log.h src/log.c profiles/network/bnep.h \
+	profiles/network/bnep.c
+@EXPERIMENTAL_TRUE@am_tools_bneptest_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/bneptest.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	btio/btio.$(OBJEXT) src/log.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/network/bnep.$(OBJEXT)
+tools_bneptest_OBJECTS = $(am_tools_bneptest_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_bneptest_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+am__tools_btattach_SOURCES_DIST = tools/btattach.c monitor/bt.h
+@EXPERIMENTAL_TRUE@am_tools_btattach_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/btattach.$(OBJEXT)
+tools_btattach_OBJECTS = $(am_tools_btattach_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_btattach_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+am__tools_btgatt_client_SOURCES_DIST = tools/btgatt-client.c \
+	src/uuid-helper.c
+@EXPERIMENTAL_TRUE@am_tools_btgatt_client_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/btgatt-client.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	src/uuid-helper.$(OBJEXT)
+tools_btgatt_client_OBJECTS = $(am_tools_btgatt_client_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_btgatt_client_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+am__tools_btgatt_server_SOURCES_DIST = tools/btgatt-server.c \
+	src/uuid-helper.c
+@EXPERIMENTAL_TRUE@am_tools_btgatt_server_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/btgatt-server.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	src/uuid-helper.$(OBJEXT)
+tools_btgatt_server_OBJECTS = $(am_tools_btgatt_server_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_btgatt_server_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+am__tools_btinfo_SOURCES_DIST = tools/btinfo.c monitor/bt.h
+@EXPERIMENTAL_TRUE@am_tools_btinfo_OBJECTS = tools/btinfo.$(OBJEXT)
+tools_btinfo_OBJECTS = $(am_tools_btinfo_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_btinfo_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+am__tools_btiotest_SOURCES_DIST = tools/btiotest.c btio/btio.h \
+	btio/btio.c
+@EXPERIMENTAL_TRUE@am_tools_btiotest_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/btiotest.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	btio/btio.$(OBJEXT)
+tools_btiotest_OBJECTS = $(am_tools_btiotest_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_btiotest_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+am__tools_btmgmt_SOURCES_DIST = tools/btmgmt.c src/uuid-helper.c \
+	client/display.c
+@READLINE_TRUE@am_tools_btmgmt_OBJECTS = tools/btmgmt.$(OBJEXT) \
+@READLINE_TRUE@	src/uuid-helper.$(OBJEXT) \
+@READLINE_TRUE@	client/display.$(OBJEXT)
+tools_btmgmt_OBJECTS = $(am_tools_btmgmt_OBJECTS)
+@READLINE_TRUE@tools_btmgmt_DEPENDENCIES =  \
+@READLINE_TRUE@	lib/libbluetooth-internal.la \
+@READLINE_TRUE@	src/libshared-mainloop.la
+am__tools_btproxy_SOURCES_DIST = tools/btproxy.c monitor/bt.h
+@EXPERIMENTAL_TRUE@am_tools_btproxy_OBJECTS = tools/btproxy.$(OBJEXT)
+tools_btproxy_OBJECTS = $(am_tools_btproxy_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_btproxy_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+am__tools_btsnoop_SOURCES_DIST = tools/btsnoop.c
+@EXPERIMENTAL_TRUE@am_tools_btsnoop_OBJECTS = tools/btsnoop.$(OBJEXT)
+tools_btsnoop_OBJECTS = $(am_tools_btsnoop_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_btsnoop_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+tools_check_selftest_SOURCES = tools/check-selftest.c
+tools_check_selftest_OBJECTS = tools/check-selftest.$(OBJEXT)
+tools_check_selftest_LDADD = $(LDADD)
 tools_ciptool_SOURCES = tools/ciptool.c
 tools_ciptool_OBJECTS = tools/ciptool.$(OBJEXT)
-@TOOLS_TRUE@tools_ciptool_DEPENDENCIES = lib/libbluetooth-private.la
-tools_dfubabel_SOURCES = tools/dfubabel.c
-tools_dfubabel_OBJECTS = tools/dfubabel.$(OBJEXT)
-tools_dfubabel_DEPENDENCIES =
-am__tools_dfutool_SOURCES_DIST = tools/dfutool.c tools/dfu.h \
-	tools/dfu.c
-@DFUTOOL_TRUE@am_tools_dfutool_OBJECTS = tools/dfutool.$(OBJEXT) \
-@DFUTOOL_TRUE@	tools/dfu.$(OBJEXT)
-tools_dfutool_OBJECTS = $(am_tools_dfutool_OBJECTS)
-tools_dfutool_DEPENDENCIES =
+@TOOLS_TRUE@tools_ciptool_DEPENDENCIES = lib/libbluetooth-internal.la
+am__tools_cltest_SOURCES_DIST = tools/cltest.c
+@EXPERIMENTAL_TRUE@am_tools_cltest_OBJECTS = tools/cltest.$(OBJEXT)
+tools_cltest_OBJECTS = $(am_tools_cltest_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_cltest_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+am__tools_create_image_SOURCES_DIST = tools/create-image.c
+@EXPERIMENTAL_TRUE@am_tools_create_image_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/create-image.$(OBJEXT)
+tools_create_image_OBJECTS = $(am_tools_create_image_OBJECTS)
+tools_create_image_LDADD = $(LDADD)
+am__tools_eddystone_SOURCES_DIST = tools/eddystone.c monitor/bt.h
+@EXPERIMENTAL_TRUE@am_tools_eddystone_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/eddystone.$(OBJEXT)
+tools_eddystone_OBJECTS = $(am_tools_eddystone_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_eddystone_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+am__tools_gap_tester_SOURCES_DIST = tools/gap-tester.c monitor/bt.h \
+	emulator/hciemu.h emulator/hciemu.c emulator/btdev.h \
+	emulator/btdev.c emulator/bthost.h emulator/bthost.c \
+	emulator/smp.c
+@EXPERIMENTAL_TRUE@am_tools_gap_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/gap-tester.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hciemu.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT)
+tools_gap_tester_OBJECTS = $(am_tools_gap_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_gap_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	gdbus/libgdbus-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
+am__tools_gatt_service_SOURCES_DIST = tools/gatt-service.c
+@EXPERIMENTAL_TRUE@am_tools_gatt_service_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/gatt-service.$(OBJEXT)
+tools_gatt_service_OBJECTS = $(am_tools_gatt_service_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_gatt_service_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	gdbus/libgdbus-internal.la
+am__tools_hci_tester_SOURCES_DIST = tools/hci-tester.c monitor/bt.h
+@EXPERIMENTAL_TRUE@am_tools_hci_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/hci-tester.$(OBJEXT)
+tools_hci_tester_OBJECTS = $(am_tools_hci_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_hci_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
 am__tools_hciattach_SOURCES_DIST = tools/hciattach.c tools/hciattach.h \
 	tools/hciattach_st.c tools/hciattach_ti.c \
 	tools/hciattach_tialt.c tools/hciattach_ath3k.c \
-	tools/hciattach_qualcomm.c tools/hciattach_intel.c
+	tools/hciattach_qualcomm.c tools/hciattach_intel.c \
+	tools/hciattach_bcm43xx.c
 @TOOLS_TRUE@am_tools_hciattach_OBJECTS = tools/hciattach.$(OBJEXT) \
 @TOOLS_TRUE@	tools/hciattach_st.$(OBJEXT) \
 @TOOLS_TRUE@	tools/hciattach_ti.$(OBJEXT) \
 @TOOLS_TRUE@	tools/hciattach_tialt.$(OBJEXT) \
 @TOOLS_TRUE@	tools/hciattach_ath3k.$(OBJEXT) \
 @TOOLS_TRUE@	tools/hciattach_qualcomm.$(OBJEXT) \
-@TOOLS_TRUE@	tools/hciattach_intel.$(OBJEXT)
+@TOOLS_TRUE@	tools/hciattach_intel.$(OBJEXT) \
+@TOOLS_TRUE@	tools/hciattach_bcm43xx.$(OBJEXT)
 tools_hciattach_OBJECTS = $(am_tools_hciattach_OBJECTS)
 @TOOLS_TRUE@tools_hciattach_DEPENDENCIES =  \
-@TOOLS_TRUE@	lib/libbluetooth-private.la
+@TOOLS_TRUE@	lib/libbluetooth-internal.la
 am__tools_hciconfig_SOURCES_DIST = tools/hciconfig.c tools/csr.h \
-	tools/csr.c src/textfile.h src/textfile.c
+	tools/csr.c
 @TOOLS_TRUE@am_tools_hciconfig_OBJECTS = tools/hciconfig.$(OBJEXT) \
-@TOOLS_TRUE@	tools/csr.$(OBJEXT) src/textfile.$(OBJEXT)
+@TOOLS_TRUE@	tools/csr.$(OBJEXT)
 tools_hciconfig_OBJECTS = $(am_tools_hciconfig_OBJECTS)
 @TOOLS_TRUE@tools_hciconfig_DEPENDENCIES =  \
-@TOOLS_TRUE@	lib/libbluetooth-private.la
+@TOOLS_TRUE@	lib/libbluetooth-internal.la
+am__tools_hcidump_SOURCES_DIST = tools/hcidump.c tools/parser/parser.h \
+	tools/parser/parser.c tools/parser/lmp.c tools/parser/hci.c \
+	tools/parser/l2cap.h tools/parser/l2cap.c tools/parser/amp.c \
+	tools/parser/smp.c tools/parser/att.c tools/parser/sdp.h \
+	tools/parser/sdp.c tools/parser/rfcomm.h tools/parser/rfcomm.c \
+	tools/parser/bnep.c tools/parser/cmtp.c tools/parser/hidp.c \
+	tools/parser/hcrp.c tools/parser/avdtp.c tools/parser/avctp.c \
+	tools/parser/avrcp.c tools/parser/sap.c tools/parser/obex.c \
+	tools/parser/capi.c tools/parser/ppp.c tools/parser/tcpip.c \
+	tools/parser/ericsson.c tools/parser/csr.c tools/parser/bpa.c
+@TOOLS_TRUE@am_tools_hcidump_OBJECTS = tools/hcidump.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/parser.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/lmp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/hci.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/l2cap.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/amp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/smp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/att.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/sdp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/rfcomm.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/bnep.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/cmtp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/hidp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/hcrp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/avdtp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/avctp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/avrcp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/sap.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/obex.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/capi.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/ppp.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/tcpip.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/ericsson.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/csr.$(OBJEXT) \
+@TOOLS_TRUE@	tools/parser/bpa.$(OBJEXT)
+tools_hcidump_OBJECTS = $(am_tools_hcidump_OBJECTS)
+@TOOLS_TRUE@tools_hcidump_DEPENDENCIES = lib/libbluetooth-internal.la
 tools_hcieventmask_SOURCES = tools/hcieventmask.c
 tools_hcieventmask_OBJECTS = tools/hcieventmask.$(OBJEXT)
-@TOOLS_TRUE@tools_hcieventmask_DEPENDENCIES =  \
-@TOOLS_TRUE@	lib/libbluetooth-private.la
+@EXPERIMENTAL_TRUE@tools_hcieventmask_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
 tools_hcisecfilter_SOURCES = tools/hcisecfilter.c
 tools_hcisecfilter_OBJECTS = tools/hcisecfilter.$(OBJEXT)
 tools_hcisecfilter_LDADD = $(LDADD)
-am__tools_hcitool_SOURCES_DIST = tools/hcitool.c src/oui.h src/oui.c \
-	src/textfile.h src/textfile.c
+am__tools_hcitool_SOURCES_DIST = tools/hcitool.c src/oui.h src/oui.c
 @TOOLS_TRUE@am_tools_hcitool_OBJECTS = tools/hcitool.$(OBJEXT) \
-@TOOLS_TRUE@	src/oui.$(OBJEXT) src/textfile.$(OBJEXT)
+@TOOLS_TRUE@	src/oui.$(OBJEXT)
 tools_hcitool_OBJECTS = $(am_tools_hcitool_OBJECTS)
-@TOOLS_TRUE@tools_hcitool_DEPENDENCIES = lib/libbluetooth-private.la
+@TOOLS_TRUE@tools_hcitool_DEPENDENCIES = lib/libbluetooth-internal.la
+am__tools_hex2hcd_SOURCES_DIST = tools/hex2hcd.c
+@TOOLS_TRUE@am_tools_hex2hcd_OBJECTS = tools/hex2hcd.$(OBJEXT)
+tools_hex2hcd_OBJECTS = $(am_tools_hex2hcd_OBJECTS)
+tools_hex2hcd_LDADD = $(LDADD)
 tools_hid2hci_SOURCES = tools/hid2hci.c
 tools_hid2hci_OBJECTS = tools/hid2hci.$(OBJEXT)
 tools_hid2hci_DEPENDENCIES =
+tools_hwdb_SOURCES = tools/hwdb.c
+tools_hwdb_OBJECTS = tools/hwdb.$(OBJEXT)
+@EXPERIMENTAL_TRUE@tools_hwdb_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+am__tools_ibeacon_SOURCES_DIST = tools/ibeacon.c monitor/bt.h
+@EXPERIMENTAL_TRUE@am_tools_ibeacon_OBJECTS = tools/ibeacon.$(OBJEXT)
+tools_ibeacon_OBJECTS = $(am_tools_ibeacon_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_ibeacon_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+am__tools_l2cap_tester_SOURCES_DIST = tools/l2cap-tester.c \
+	monitor/bt.h emulator/hciemu.h emulator/hciemu.c \
+	emulator/btdev.h emulator/btdev.c emulator/bthost.h \
+	emulator/bthost.c emulator/smp.c
+@EXPERIMENTAL_TRUE@am_tools_l2cap_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/l2cap-tester.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hciemu.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT)
+tools_l2cap_tester_OBJECTS = $(am_tools_l2cap_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_l2cap_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
 tools_l2ping_SOURCES = tools/l2ping.c
 tools_l2ping_OBJECTS = tools/l2ping.$(OBJEXT)
-@TOOLS_TRUE@tools_l2ping_DEPENDENCIES = lib/libbluetooth-private.la
-tools_ppporc_SOURCES = tools/ppporc.c
-tools_ppporc_OBJECTS = tools/ppporc.$(OBJEXT)
-@TOOLS_TRUE@tools_ppporc_DEPENDENCIES = lib/libbluetooth-private.la
-am__tools_rfcomm_SOURCES_DIST = tools/rfcomm.c tools/parser.y \
-	tools/lexer.l tools/kword.h tools/kword.c
-@TOOLS_TRUE@am_tools_rfcomm_OBJECTS = tools/rfcomm.$(OBJEXT) \
-@TOOLS_TRUE@	tools/parser.$(OBJEXT) tools/lexer.$(OBJEXT) \
-@TOOLS_TRUE@	tools/kword.$(OBJEXT)
-am__EXTRA_tools_rfcomm_SOURCES_DIST = tools/parser.h tools/parser.c \
-	tools/lexer.c
-tools_rfcomm_OBJECTS = $(am_tools_rfcomm_OBJECTS)
-@TOOLS_TRUE@tools_rfcomm_DEPENDENCIES = lib/libbluetooth-private.la
+@TOOLS_TRUE@tools_l2ping_DEPENDENCIES = lib/libbluetooth-internal.la
+tools_l2test_SOURCES = tools/l2test.c
+tools_l2test_OBJECTS = tools/l2test.$(OBJEXT)
+@TOOLS_TRUE@tools_l2test_DEPENDENCIES = lib/libbluetooth-internal.la
+am__tools_mcaptest_SOURCES_DIST = tools/mcaptest.c btio/btio.h \
+	btio/btio.c src/log.c src/log.h profiles/health/mcap.h \
+	profiles/health/mcap.c
+@EXPERIMENTAL_TRUE@am_tools_mcaptest_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/mcaptest.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	btio/btio.$(OBJEXT) src/log.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	profiles/health/mcap.$(OBJEXT)
+tools_mcaptest_OBJECTS = $(am_tools_mcaptest_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_mcaptest_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
+am__tools_mgmt_tester_SOURCES_DIST = tools/mgmt-tester.c monitor/bt.h \
+	emulator/hciemu.h emulator/hciemu.c emulator/btdev.h \
+	emulator/btdev.c emulator/bthost.h emulator/bthost.c \
+	emulator/smp.c
+@EXPERIMENTAL_TRUE@am_tools_mgmt_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/mgmt-tester.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hciemu.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT)
+tools_mgmt_tester_OBJECTS = $(am_tools_mgmt_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_mgmt_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
+am__tools_mpris_proxy_SOURCES_DIST = tools/mpris-proxy.c
+@TOOLS_TRUE@am_tools_mpris_proxy_OBJECTS =  \
+@TOOLS_TRUE@	tools/mpris-proxy.$(OBJEXT)
+tools_mpris_proxy_OBJECTS = $(am_tools_mpris_proxy_OBJECTS)
+@TOOLS_TRUE@tools_mpris_proxy_DEPENDENCIES =  \
+@TOOLS_TRUE@	gdbus/libgdbus-internal.la
+am__tools_nokfw_SOURCES_DIST = tools/nokfw.c
+@EXPERIMENTAL_TRUE@am_tools_nokfw_OBJECTS = tools/nokfw.$(OBJEXT)
+tools_nokfw_OBJECTS = $(am_tools_nokfw_OBJECTS)
+tools_nokfw_LDADD = $(LDADD)
+am__tools_obex_client_tool_SOURCES_DIST = gobex/gobex.h gobex/gobex.c \
+	gobex/gobex-defs.h gobex/gobex-defs.c gobex/gobex-packet.c \
+	gobex/gobex-packet.h gobex/gobex-header.c gobex/gobex-header.h \
+	gobex/gobex-transfer.c gobex/gobex-debug.h \
+	gobex/gobex-apparam.c gobex/gobex-apparam.h btio/btio.h \
+	btio/btio.c tools/obex-client-tool.c
+am__objects_18 = gobex/gobex.$(OBJEXT) gobex/gobex-defs.$(OBJEXT) \
+	gobex/gobex-packet.$(OBJEXT) gobex/gobex-header.$(OBJEXT) \
+	gobex/gobex-transfer.$(OBJEXT) gobex/gobex-apparam.$(OBJEXT)
+am__objects_19 = btio/btio.$(OBJEXT)
+@READLINE_TRUE@am_tools_obex_client_tool_OBJECTS = $(am__objects_18) \
+@READLINE_TRUE@	$(am__objects_19) \
+@READLINE_TRUE@	tools/obex-client-tool.$(OBJEXT)
+tools_obex_client_tool_OBJECTS = $(am_tools_obex_client_tool_OBJECTS)
+@READLINE_TRUE@tools_obex_client_tool_DEPENDENCIES =  \
+@READLINE_TRUE@	lib/libbluetooth-internal.la
+am__tools_obex_server_tool_SOURCES_DIST = gobex/gobex.h gobex/gobex.c \
+	gobex/gobex-defs.h gobex/gobex-defs.c gobex/gobex-packet.c \
+	gobex/gobex-packet.h gobex/gobex-header.c gobex/gobex-header.h \
+	gobex/gobex-transfer.c gobex/gobex-debug.h \
+	gobex/gobex-apparam.c gobex/gobex-apparam.h btio/btio.h \
+	btio/btio.c tools/obex-server-tool.c
+@READLINE_TRUE@am_tools_obex_server_tool_OBJECTS = $(am__objects_18) \
+@READLINE_TRUE@	$(am__objects_19) \
+@READLINE_TRUE@	tools/obex-server-tool.$(OBJEXT)
+tools_obex_server_tool_OBJECTS = $(am_tools_obex_server_tool_OBJECTS)
+@READLINE_TRUE@tools_obex_server_tool_DEPENDENCIES =  \
+@READLINE_TRUE@	lib/libbluetooth-internal.la
+am__tools_obexctl_SOURCES_DIST = tools/obexctl.c client/display.h \
+	client/display.c
+@READLINE_TRUE@am_tools_obexctl_OBJECTS = tools/obexctl.$(OBJEXT) \
+@READLINE_TRUE@	client/display.$(OBJEXT)
+tools_obexctl_OBJECTS = $(am_tools_obexctl_OBJECTS)
+@READLINE_TRUE@tools_obexctl_DEPENDENCIES =  \
+@READLINE_TRUE@	gdbus/libgdbus-internal.la
+am__tools_oobtest_SOURCES_DIST = tools/oobtest.c
+@EXPERIMENTAL_TRUE@am_tools_oobtest_OBJECTS = tools/oobtest.$(OBJEXT)
+tools_oobtest_OBJECTS = $(am_tools_oobtest_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_oobtest_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-mainloop.la
+tools_rctest_SOURCES = tools/rctest.c
+tools_rctest_OBJECTS = tools/rctest.$(OBJEXT)
+@TOOLS_TRUE@tools_rctest_DEPENDENCIES = lib/libbluetooth-internal.la
+tools_rfcomm_SOURCES = tools/rfcomm.c
+tools_rfcomm_OBJECTS = tools/rfcomm.$(OBJEXT)
+@TOOLS_TRUE@tools_rfcomm_DEPENDENCIES = lib/libbluetooth-internal.la
+am__tools_rfcomm_tester_SOURCES_DIST = tools/rfcomm-tester.c \
+	monitor/bt.h emulator/hciemu.h emulator/hciemu.c \
+	emulator/btdev.h emulator/btdev.c emulator/bthost.h \
+	emulator/bthost.c emulator/smp.c
+@EXPERIMENTAL_TRUE@am_tools_rfcomm_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/rfcomm-tester.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hciemu.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT)
+tools_rfcomm_tester_OBJECTS = $(am_tools_rfcomm_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_rfcomm_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
+am__tools_sco_tester_SOURCES_DIST = tools/sco-tester.c monitor/bt.h \
+	emulator/hciemu.h emulator/hciemu.c emulator/btdev.h \
+	emulator/btdev.c emulator/bthost.h emulator/bthost.c \
+	emulator/smp.c
+@EXPERIMENTAL_TRUE@am_tools_sco_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/sco-tester.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hciemu.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT)
+tools_sco_tester_OBJECTS = $(am_tools_sco_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_sco_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
+tools_scotest_SOURCES = tools/scotest.c
+tools_scotest_OBJECTS = tools/scotest.$(OBJEXT)
+@EXPERIMENTAL_TRUE@tools_scotest_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la
 am__tools_sdptool_SOURCES_DIST = tools/sdptool.c src/sdp-xml.h \
 	src/sdp-xml.c
 @TOOLS_TRUE@am_tools_sdptool_OBJECTS = tools/sdptool.$(OBJEXT) \
 @TOOLS_TRUE@	src/sdp-xml.$(OBJEXT)
 tools_sdptool_OBJECTS = $(am_tools_sdptool_OBJECTS)
-@TOOLS_TRUE@tools_sdptool_DEPENDENCIES = lib/libbluetooth-private.la
-am__unit_test_eir_SOURCES_DIST = unit/test-eir.c src/eir.c \
-	src/glib-helper.c
-@TEST_TRUE@am_unit_test_eir_OBJECTS =  \
-@TEST_TRUE@	unit/unit_test_eir-test-eir.$(OBJEXT) \
-@TEST_TRUE@	src/unit_test_eir-eir.$(OBJEXT) \
-@TEST_TRUE@	src/unit_test_eir-glib-helper.$(OBJEXT)
+@TOOLS_TRUE@tools_sdptool_DEPENDENCIES = lib/libbluetooth-internal.la
+am__tools_seq2bseq_SOURCES_DIST = tools/seq2bseq.c
+@EXPERIMENTAL_TRUE@am_tools_seq2bseq_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/seq2bseq.$(OBJEXT)
+tools_seq2bseq_OBJECTS = $(am_tools_seq2bseq_OBJECTS)
+tools_seq2bseq_LDADD = $(LDADD)
+am__tools_smp_tester_SOURCES_DIST = tools/smp-tester.c monitor/bt.h \
+	emulator/hciemu.h emulator/hciemu.c emulator/btdev.h \
+	emulator/btdev.c emulator/bthost.h emulator/bthost.c \
+	emulator/smp.c
+@EXPERIMENTAL_TRUE@am_tools_smp_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/smp-tester.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hciemu.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT)
+tools_smp_tester_OBJECTS = $(am_tools_smp_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_smp_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
+tools_test_runner_SOURCES = tools/test-runner.c
+tools_test_runner_OBJECTS = tools/test-runner.$(OBJEXT)
+tools_test_runner_LDADD = $(LDADD)
+am__tools_userchan_tester_SOURCES_DIST = tools/userchan-tester.c \
+	monitor/bt.h emulator/hciemu.h emulator/hciemu.c \
+	emulator/btdev.h emulator/btdev.c emulator/bthost.h \
+	emulator/bthost.c emulator/smp.c
+@EXPERIMENTAL_TRUE@am_tools_userchan_tester_OBJECTS =  \
+@EXPERIMENTAL_TRUE@	tools/userchan-tester.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/hciemu.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/btdev.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/bthost.$(OBJEXT) \
+@EXPERIMENTAL_TRUE@	emulator/smp.$(OBJEXT)
+tools_userchan_tester_OBJECTS = $(am_tools_userchan_tester_OBJECTS)
+@EXPERIMENTAL_TRUE@tools_userchan_tester_DEPENDENCIES =  \
+@EXPERIMENTAL_TRUE@	lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@	src/libshared-glib.la
+am_unit_test_avctp_OBJECTS = unit/test-avctp.$(OBJEXT) \
+	src/log.$(OBJEXT) android/avctp.$(OBJEXT)
+unit_test_avctp_OBJECTS = $(am_unit_test_avctp_OBJECTS)
+unit_test_avctp_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_avdtp_OBJECTS = unit/test-avdtp.$(OBJEXT) \
+	src/log.$(OBJEXT) android/avdtp.$(OBJEXT)
+unit_test_avdtp_OBJECTS = $(am_unit_test_avdtp_OBJECTS)
+unit_test_avdtp_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_avrcp_OBJECTS = unit/test-avrcp.$(OBJEXT) \
+	src/log.$(OBJEXT) android/avctp.$(OBJEXT) \
+	android/avrcp-lib.$(OBJEXT)
+unit_test_avrcp_OBJECTS = $(am_unit_test_avrcp_OBJECTS)
+unit_test_avrcp_DEPENDENCIES = lib/libbluetooth-internal.la \
+	src/libshared-glib.la
+am_unit_test_crc_OBJECTS = unit/test-crc.$(OBJEXT) \
+	monitor/crc.$(OBJEXT)
+unit_test_crc_OBJECTS = $(am_unit_test_crc_OBJECTS)
+unit_test_crc_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_crypto_OBJECTS = unit/test-crypto.$(OBJEXT)
+unit_test_crypto_OBJECTS = $(am_unit_test_crypto_OBJECTS)
+unit_test_crypto_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_ecc_OBJECTS = unit/test-ecc.$(OBJEXT)
+unit_test_ecc_OBJECTS = $(am_unit_test_ecc_OBJECTS)
+unit_test_ecc_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_eir_OBJECTS = unit/test-eir.$(OBJEXT) src/eir.$(OBJEXT) \
+	src/uuid-helper.$(OBJEXT)
 unit_test_eir_OBJECTS = $(am_unit_test_eir_OBJECTS)
-@TEST_TRUE@unit_test_eir_DEPENDENCIES = lib/libbluetooth-private.la
-unit_test_eir_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(unit_test_eir_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__dist_udev_SCRIPTS_DIST = scripts/bluetooth_serial
-SCRIPTS = $(dist_udev_SCRIPTS)
+unit_test_eir_DEPENDENCIES = src/libshared-glib.la \
+	lib/libbluetooth-internal.la
+am_unit_test_gatt_OBJECTS = unit/test-gatt.$(OBJEXT)
+unit_test_gatt_OBJECTS = $(am_unit_test_gatt_OBJECTS)
+unit_test_gatt_DEPENDENCIES = src/libshared-glib.la \
+	lib/libbluetooth-internal.la
+am_unit_test_gattrib_OBJECTS = unit/test-gattrib.$(OBJEXT) \
+	attrib/gattrib.$(OBJEXT) $(am__objects_19) src/log.$(OBJEXT)
+unit_test_gattrib_OBJECTS = $(am_unit_test_gattrib_OBJECTS)
+unit_test_gattrib_DEPENDENCIES = lib/libbluetooth-internal.la \
+	src/libshared-glib.la
+am_unit_test_gdbus_client_OBJECTS = unit/test-gdbus-client.$(OBJEXT)
+unit_test_gdbus_client_OBJECTS = $(am_unit_test_gdbus_client_OBJECTS)
+unit_test_gdbus_client_DEPENDENCIES = gdbus/libgdbus-internal.la \
+	src/libshared-glib.la
+am_unit_test_gobex_OBJECTS = $(am__objects_18) unit/util.$(OBJEXT) \
+	unit/test-gobex.$(OBJEXT)
+unit_test_gobex_OBJECTS = $(am_unit_test_gobex_OBJECTS)
+unit_test_gobex_DEPENDENCIES =
+am_unit_test_gobex_apparam_OBJECTS = $(am__objects_18) \
+	unit/util.$(OBJEXT) unit/test-gobex-apparam.$(OBJEXT)
+unit_test_gobex_apparam_OBJECTS =  \
+	$(am_unit_test_gobex_apparam_OBJECTS)
+unit_test_gobex_apparam_DEPENDENCIES =
+am_unit_test_gobex_header_OBJECTS = $(am__objects_18) \
+	unit/util.$(OBJEXT) unit/test-gobex-header.$(OBJEXT)
+unit_test_gobex_header_OBJECTS = $(am_unit_test_gobex_header_OBJECTS)
+unit_test_gobex_header_DEPENDENCIES =
+am_unit_test_gobex_packet_OBJECTS = $(am__objects_18) \
+	unit/util.$(OBJEXT) unit/test-gobex-packet.$(OBJEXT)
+unit_test_gobex_packet_OBJECTS = $(am_unit_test_gobex_packet_OBJECTS)
+unit_test_gobex_packet_DEPENDENCIES =
+am_unit_test_gobex_transfer_OBJECTS = $(am__objects_18) \
+	unit/util.$(OBJEXT) unit/test-gobex-transfer.$(OBJEXT)
+unit_test_gobex_transfer_OBJECTS =  \
+	$(am_unit_test_gobex_transfer_OBJECTS)
+unit_test_gobex_transfer_DEPENDENCIES =
+am_unit_test_hfp_OBJECTS = unit/test-hfp.$(OBJEXT)
+unit_test_hfp_OBJECTS = $(am_unit_test_hfp_OBJECTS)
+unit_test_hfp_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_hog_OBJECTS = unit/test-hog.$(OBJEXT) $(am__objects_19) \
+	android/hog.$(OBJEXT) android/scpp.$(OBJEXT) \
+	android/bas.$(OBJEXT) android/dis.$(OBJEXT) src/log.$(OBJEXT) \
+	attrib/att.$(OBJEXT) attrib/gatt.$(OBJEXT) \
+	attrib/gattrib.$(OBJEXT)
+unit_test_hog_OBJECTS = $(am_unit_test_hog_OBJECTS)
+unit_test_hog_DEPENDENCIES = src/libshared-glib.la \
+	lib/libbluetooth-internal.la
+am_unit_test_lib_OBJECTS = unit/test-lib.$(OBJEXT)
+unit_test_lib_OBJECTS = $(am_unit_test_lib_OBJECTS)
+unit_test_lib_DEPENDENCIES = src/libshared-glib.la \
+	lib/libbluetooth-internal.la
+am_unit_test_mgmt_OBJECTS = unit/test-mgmt.$(OBJEXT)
+unit_test_mgmt_OBJECTS = $(am_unit_test_mgmt_OBJECTS)
+unit_test_mgmt_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_queue_OBJECTS = unit/test-queue.$(OBJEXT)
+unit_test_queue_OBJECTS = $(am_unit_test_queue_OBJECTS)
+unit_test_queue_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_ringbuf_OBJECTS = unit/test-ringbuf.$(OBJEXT)
+unit_test_ringbuf_OBJECTS = $(am_unit_test_ringbuf_OBJECTS)
+unit_test_ringbuf_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_sdp_OBJECTS = unit/test-sdp.$(OBJEXT) \
+	src/sdpd-database.$(OBJEXT) src/log.$(OBJEXT) \
+	src/sdpd-service.$(OBJEXT) src/sdpd-request.$(OBJEXT)
+unit_test_sdp_OBJECTS = $(am_unit_test_sdp_OBJECTS)
+unit_test_sdp_DEPENDENCIES = lib/libbluetooth-internal.la \
+	src/libshared-glib.la
+am_unit_test_textfile_OBJECTS = unit/test-textfile.$(OBJEXT) \
+	src/textfile.$(OBJEXT)
+unit_test_textfile_OBJECTS = $(am_unit_test_textfile_OBJECTS)
+unit_test_textfile_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_uhid_OBJECTS = unit/test-uhid.$(OBJEXT)
+unit_test_uhid_OBJECTS = $(am_unit_test_uhid_OBJECTS)
+unit_test_uhid_DEPENDENCIES = src/libshared-glib.la
+am_unit_test_uuid_OBJECTS = unit/test-uuid.$(OBJEXT)
+unit_test_uuid_OBJECTS = $(am_unit_test_uuid_OBJECTS)
+unit_test_uuid_DEPENDENCIES = src/libshared-glib.la \
+	lib/libbluetooth-internal.la
+SCRIPTS = $(test_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -866,121 +1600,380 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
-LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
-AM_V_LEX = $(am__v_LEX_@AM_V@)
-am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
-am__v_LEX_0 = @echo "  LEX   " $@;
-YLWRAP = $(top_srcdir)/ylwrap
-@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
-YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
-AM_V_YACC = $(am__v_YACC_@AM_V@)
-am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
-am__v_YACC_0 = @echo "  YACC  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(audio_libtelephony_a_SOURCES) $(sap_libsap_a_SOURCES) \
-	$(audio_libasound_module_ctl_bluetooth_la_SOURCES) \
-	$(audio_libasound_module_pcm_bluetooth_la_SOURCES) \
-	$(audio_libgstbluetooth_la_SOURCES) \
-	$(lib_libbluetooth_private_la_SOURCES) \
-	$(lib_libbluetooth_la_SOURCES) \
-	$(plugins_external_dummy_la_SOURCES) $(sbc_libsbc_la_SOURCES) \
-	$(attrib_gatttool_SOURCES) $(compat_dund_SOURCES) \
-	$(compat_hidd_SOURCES) $(compat_pand_SOURCES) \
-	$(cups_bluetooth_SOURCES) $(emulator_btvirt_SOURCES) \
-	$(mgmt_btmgmt_SOURCES) $(monitor_btmon_SOURCES) \
-	$(sbc_sbcdec_SOURCES) $(sbc_sbcenc_SOURCES) sbc/sbcinfo.c \
-	sbc/sbctester.c $(src_bluetoothd_SOURCES) \
-	$(nodist_src_bluetoothd_SOURCES) test/agent.c test/attest.c \
-	test/avtest.c $(test_bdaddr_SOURCES) $(test_btiotest_SOURCES) \
-	test/gaptest.c test/hciemu.c test/hstest.c \
-	$(test_ipctest_SOURCES) test/l2test.c test/lmptest.c \
-	$(test_mpris_player_SOURCES) test/rctest.c test/scotest.c \
-	test/sdptest.c $(test_test_textfile_SOURCES) \
-	$(test_uuidtest_SOURCES) tools/avctrl.c tools/avinfo.c \
-	$(tools_bccmd_SOURCES) tools/ciptool.c tools/dfubabel.c \
-	$(tools_dfutool_SOURCES) $(tools_hciattach_SOURCES) \
-	$(tools_hciconfig_SOURCES) tools/hcieventmask.c \
-	tools/hcisecfilter.c $(tools_hcitool_SOURCES) tools/hid2hci.c \
-	tools/l2ping.c tools/ppporc.c $(tools_rfcomm_SOURCES) \
-	$(EXTRA_tools_rfcomm_SOURCES) $(tools_sdptool_SOURCES) \
-	$(unit_test_eir_SOURCES)
-DIST_SOURCES = $(am__audio_libtelephony_a_SOURCES_DIST) \
-	$(am__sap_libsap_a_SOURCES_DIST) \
-	$(am__audio_libasound_module_ctl_bluetooth_la_SOURCES_DIST) \
-	$(am__audio_libasound_module_pcm_bluetooth_la_SOURCES_DIST) \
-	$(am__audio_libgstbluetooth_la_SOURCES_DIST) \
-	$(lib_libbluetooth_private_la_SOURCES) \
-	$(lib_libbluetooth_la_SOURCES) \
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(profiles_sap_libsap_a_SOURCES) \
+	$(android_audio_a2dp_default_la_SOURCES) \
+	$(android_audio_sco_default_la_SOURCES) \
+	$(android_bluetooth_default_la_SOURCES) \
+	$(gdbus_libgdbus_internal_la_SOURCES) \
+	$(lib_libbluetooth_internal_la_SOURCES) \
+	$(lib_libbluetooth_la_SOURCES) \
+	$(plugins_external_dummy_la_SOURCES) \
+	$(plugins_sixaxis_la_SOURCES) $(src_libshared_glib_la_SOURCES) \
+	$(src_libshared_mainloop_la_SOURCES) \
+	$(android_android_tester_SOURCES) $(android_avdtptest_SOURCES) \
+	$(android_bluetoothd_SOURCES) \
+	$(android_bluetoothd_snoop_SOURCES) $(android_haltest_SOURCES) \
+	$(android_ipc_tester_SOURCES) \
+	$(android_system_emulator_SOURCES) $(android_test_ipc_SOURCES) \
+	$(attrib_gatttool_SOURCES) $(client_bluetoothctl_SOURCES) \
+	$(emulator_b1ee_SOURCES) $(emulator_btvirt_SOURCES) \
+	$(emulator_hfp_SOURCES) $(monitor_btmon_SOURCES) \
+	$(obexd_src_obexd_SOURCES) $(nodist_obexd_src_obexd_SOURCES) \
+	$(peripheral_btsensor_SOURCES) \
+	$(profiles_cups_bluetooth_SOURCES) \
+	$(profiles_iap_iapd_SOURCES) $(src_bluetoothd_SOURCES) \
+	$(nodist_src_bluetoothd_SOURCES) $(tools_3dsp_SOURCES) \
+	tools/amptest.c tools/avinfo.c tools/avtest.c \
+	$(tools_bccmd_SOURCES) $(tools_bdaddr_SOURCES) \
+	$(tools_bluemoon_SOURCES) $(tools_bluetooth_player_SOURCES) \
+	$(tools_bnep_tester_SOURCES) $(tools_bneptest_SOURCES) \
+	$(tools_btattach_SOURCES) $(tools_btgatt_client_SOURCES) \
+	$(tools_btgatt_server_SOURCES) $(tools_btinfo_SOURCES) \
+	$(tools_btiotest_SOURCES) $(tools_btmgmt_SOURCES) \
+	$(tools_btproxy_SOURCES) $(tools_btsnoop_SOURCES) \
+	tools/check-selftest.c tools/ciptool.c $(tools_cltest_SOURCES) \
+	$(tools_create_image_SOURCES) $(tools_eddystone_SOURCES) \
+	$(tools_gap_tester_SOURCES) $(tools_gatt_service_SOURCES) \
+	$(tools_hci_tester_SOURCES) $(tools_hciattach_SOURCES) \
+	$(tools_hciconfig_SOURCES) $(tools_hcidump_SOURCES) \
+	tools/hcieventmask.c tools/hcisecfilter.c \
+	$(tools_hcitool_SOURCES) $(tools_hex2hcd_SOURCES) \
+	tools/hid2hci.c tools/hwdb.c $(tools_ibeacon_SOURCES) \
+	$(tools_l2cap_tester_SOURCES) tools/l2ping.c tools/l2test.c \
+	$(tools_mcaptest_SOURCES) $(tools_mgmt_tester_SOURCES) \
+	$(tools_mpris_proxy_SOURCES) $(tools_nokfw_SOURCES) \
+	$(tools_obex_client_tool_SOURCES) \
+	$(tools_obex_server_tool_SOURCES) $(tools_obexctl_SOURCES) \
+	$(tools_oobtest_SOURCES) tools/rctest.c tools/rfcomm.c \
+	$(tools_rfcomm_tester_SOURCES) $(tools_sco_tester_SOURCES) \
+	tools/scotest.c $(tools_sdptool_SOURCES) \
+	$(tools_seq2bseq_SOURCES) $(tools_smp_tester_SOURCES) \
+	tools/test-runner.c $(tools_userchan_tester_SOURCES) \
+	$(unit_test_avctp_SOURCES) $(unit_test_avdtp_SOURCES) \
+	$(unit_test_avrcp_SOURCES) $(unit_test_crc_SOURCES) \
+	$(unit_test_crypto_SOURCES) $(unit_test_ecc_SOURCES) \
+	$(unit_test_eir_SOURCES) $(unit_test_gatt_SOURCES) \
+	$(unit_test_gattrib_SOURCES) $(unit_test_gdbus_client_SOURCES) \
+	$(unit_test_gobex_SOURCES) $(unit_test_gobex_apparam_SOURCES) \
+	$(unit_test_gobex_header_SOURCES) \
+	$(unit_test_gobex_packet_SOURCES) \
+	$(unit_test_gobex_transfer_SOURCES) $(unit_test_hfp_SOURCES) \
+	$(unit_test_hog_SOURCES) $(unit_test_lib_SOURCES) \
+	$(unit_test_mgmt_SOURCES) $(unit_test_queue_SOURCES) \
+	$(unit_test_ringbuf_SOURCES) $(unit_test_sdp_SOURCES) \
+	$(unit_test_textfile_SOURCES) $(unit_test_uhid_SOURCES) \
+	$(unit_test_uuid_SOURCES)
+DIST_SOURCES = $(am__profiles_sap_libsap_a_SOURCES_DIST) \
+	$(am__android_audio_a2dp_default_la_SOURCES_DIST) \
+	$(am__android_audio_sco_default_la_SOURCES_DIST) \
+	$(am__android_bluetooth_default_la_SOURCES_DIST) \
+	$(gdbus_libgdbus_internal_la_SOURCES) \
+	$(lib_libbluetooth_internal_la_SOURCES) \
+	$(am__lib_libbluetooth_la_SOURCES_DIST) \
 	$(am__plugins_external_dummy_la_SOURCES_DIST) \
-	$(am__sbc_libsbc_la_SOURCES_DIST) \
+	$(am__plugins_sixaxis_la_SOURCES_DIST) \
+	$(src_libshared_glib_la_SOURCES) \
+	$(src_libshared_mainloop_la_SOURCES) \
+	$(am__android_android_tester_SOURCES_DIST) \
+	$(am__android_avdtptest_SOURCES_DIST) \
+	$(am__android_bluetoothd_SOURCES_DIST) \
+	$(am__android_bluetoothd_snoop_SOURCES_DIST) \
+	$(am__android_haltest_SOURCES_DIST) \
+	$(am__android_ipc_tester_SOURCES_DIST) \
+	$(am__android_system_emulator_SOURCES_DIST) \
+	$(am__android_test_ipc_SOURCES_DIST) \
 	$(am__attrib_gatttool_SOURCES_DIST) \
-	$(am__compat_dund_SOURCES_DIST) \
-	$(am__compat_hidd_SOURCES_DIST) \
-	$(am__compat_pand_SOURCES_DIST) \
-	$(am__cups_bluetooth_SOURCES_DIST) \
+	$(am__client_bluetoothctl_SOURCES_DIST) \
+	$(am__emulator_b1ee_SOURCES_DIST) \
 	$(am__emulator_btvirt_SOURCES_DIST) \
-	$(am__mgmt_btmgmt_SOURCES_DIST) \
+	$(am__emulator_hfp_SOURCES_DIST) \
 	$(am__monitor_btmon_SOURCES_DIST) \
-	$(am__sbc_sbcdec_SOURCES_DIST) $(am__sbc_sbcenc_SOURCES_DIST) \
-	sbc/sbcinfo.c sbc/sbctester.c \
-	$(am__src_bluetoothd_SOURCES_DIST) test/agent.c test/attest.c \
-	test/avtest.c $(am__test_bdaddr_SOURCES_DIST) \
-	$(am__test_btiotest_SOURCES_DIST) test/gaptest.c test/hciemu.c \
-	test/hstest.c $(am__test_ipctest_SOURCES_DIST) test/l2test.c \
-	test/lmptest.c $(am__test_mpris_player_SOURCES_DIST) \
-	test/rctest.c test/scotest.c test/sdptest.c \
-	$(am__test_test_textfile_SOURCES_DIST) \
-	$(am__test_uuidtest_SOURCES_DIST) tools/avctrl.c \
-	tools/avinfo.c $(am__tools_bccmd_SOURCES_DIST) tools/ciptool.c \
-	tools/dfubabel.c $(am__tools_dfutool_SOURCES_DIST) \
+	$(am__obexd_src_obexd_SOURCES_DIST) \
+	$(am__peripheral_btsensor_SOURCES_DIST) \
+	$(am__profiles_cups_bluetooth_SOURCES_DIST) \
+	$(am__profiles_iap_iapd_SOURCES_DIST) \
+	$(am__src_bluetoothd_SOURCES_DIST) \
+	$(am__tools_3dsp_SOURCES_DIST) tools/amptest.c tools/avinfo.c \
+	tools/avtest.c $(am__tools_bccmd_SOURCES_DIST) \
+	$(am__tools_bdaddr_SOURCES_DIST) \
+	$(am__tools_bluemoon_SOURCES_DIST) \
+	$(am__tools_bluetooth_player_SOURCES_DIST) \
+	$(am__tools_bnep_tester_SOURCES_DIST) \
+	$(am__tools_bneptest_SOURCES_DIST) \
+	$(am__tools_btattach_SOURCES_DIST) \
+	$(am__tools_btgatt_client_SOURCES_DIST) \
+	$(am__tools_btgatt_server_SOURCES_DIST) \
+	$(am__tools_btinfo_SOURCES_DIST) \
+	$(am__tools_btiotest_SOURCES_DIST) \
+	$(am__tools_btmgmt_SOURCES_DIST) \
+	$(am__tools_btproxy_SOURCES_DIST) \
+	$(am__tools_btsnoop_SOURCES_DIST) tools/check-selftest.c \
+	tools/ciptool.c $(am__tools_cltest_SOURCES_DIST) \
+	$(am__tools_create_image_SOURCES_DIST) \
+	$(am__tools_eddystone_SOURCES_DIST) \
+	$(am__tools_gap_tester_SOURCES_DIST) \
+	$(am__tools_gatt_service_SOURCES_DIST) \
+	$(am__tools_hci_tester_SOURCES_DIST) \
 	$(am__tools_hciattach_SOURCES_DIST) \
-	$(am__tools_hciconfig_SOURCES_DIST) tools/hcieventmask.c \
+	$(am__tools_hciconfig_SOURCES_DIST) \
+	$(am__tools_hcidump_SOURCES_DIST) tools/hcieventmask.c \
 	tools/hcisecfilter.c $(am__tools_hcitool_SOURCES_DIST) \
-	tools/hid2hci.c tools/l2ping.c tools/ppporc.c \
-	$(am__tools_rfcomm_SOURCES_DIST) \
-	$(am__EXTRA_tools_rfcomm_SOURCES_DIST) \
+	$(am__tools_hex2hcd_SOURCES_DIST) tools/hid2hci.c tools/hwdb.c \
+	$(am__tools_ibeacon_SOURCES_DIST) \
+	$(am__tools_l2cap_tester_SOURCES_DIST) tools/l2ping.c \
+	tools/l2test.c $(am__tools_mcaptest_SOURCES_DIST) \
+	$(am__tools_mgmt_tester_SOURCES_DIST) \
+	$(am__tools_mpris_proxy_SOURCES_DIST) \
+	$(am__tools_nokfw_SOURCES_DIST) \
+	$(am__tools_obex_client_tool_SOURCES_DIST) \
+	$(am__tools_obex_server_tool_SOURCES_DIST) \
+	$(am__tools_obexctl_SOURCES_DIST) \
+	$(am__tools_oobtest_SOURCES_DIST) tools/rctest.c \
+	tools/rfcomm.c $(am__tools_rfcomm_tester_SOURCES_DIST) \
+	$(am__tools_sco_tester_SOURCES_DIST) tools/scotest.c \
 	$(am__tools_sdptool_SOURCES_DIST) \
-	$(am__unit_test_eir_SOURCES_DIST)
+	$(am__tools_seq2bseq_SOURCES_DIST) \
+	$(am__tools_smp_tester_SOURCES_DIST) tools/test-runner.c \
+	$(am__tools_userchan_tester_SOURCES_DIST) \
+	$(unit_test_avctp_SOURCES) $(unit_test_avdtp_SOURCES) \
+	$(unit_test_avrcp_SOURCES) $(unit_test_crc_SOURCES) \
+	$(unit_test_crypto_SOURCES) $(unit_test_ecc_SOURCES) \
+	$(unit_test_eir_SOURCES) $(unit_test_gatt_SOURCES) \
+	$(unit_test_gattrib_SOURCES) $(unit_test_gdbus_client_SOURCES) \
+	$(unit_test_gobex_SOURCES) $(unit_test_gobex_apparam_SOURCES) \
+	$(unit_test_gobex_header_SOURCES) \
+	$(unit_test_gobex_packet_SOURCES) \
+	$(unit_test_gobex_transfer_SOURCES) $(unit_test_hfp_SOURCES) \
+	$(unit_test_hog_SOURCES) $(unit_test_lib_SOURCES) \
+	$(unit_test_mgmt_SOURCES) $(unit_test_queue_SOURCES) \
+	$(unit_test_ringbuf_SOURCES) $(unit_test_sdp_SOURCES) \
+	$(unit_test_textfile_SOURCES) $(unit_test_uhid_SOURCES) \
+	$(unit_test_uuid_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(dist_man_MANS) $(man_MANS)
-DATA = $(alsaconf_DATA) $(conf_DATA) $(dbus_DATA) $(dbusservice_DATA) \
-	$(pkgconfig_DATA) $(rules_DATA) $(state_DATA) \
-	$(systemdunit_DATA)
+DATA = $(conf_DATA) $(dbus_DATA) $(dbussessionbus_DATA) \
+	$(dbussystembus_DATA) $(pkgconfig_DATA) $(rules_DATA) \
+	$(state_DATA) $(systemdsystemunit_DATA) \
+	$(systemduserunit_DATA)
+am__include_HEADERS_DIST = lib/bluetooth.h lib/hci.h lib/hci_lib.h \
+	lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h lib/rfcomm.h \
+	lib/bnep.h lib/cmtp.h lib/hidp.h
 HEADERS = $(include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
-# then this fails; a conservative approach.  Of course do not redirect
-# stdout here, just stderr.
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=; \
-test "X$(AM_COLOR_TESTS)" != Xno \
-&& test "X$$TERM" != Xdumb \
-&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
-&& { \
-  red=''; \
-  grn=''; \
-  lgn=''; \
-  blu=''; \
-  std=''; \
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope check recheck
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
 }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -990,15 +1983,15 @@
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
-DIST_ARCHIVES = $(distdir).tar.gz
+am__post_remove_distdir = $(am__remove_distdir)
 GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -1009,14 +2002,15 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
 CONFIGDIR = @CONFIGDIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_CONFDIR = @DBUS_CONFDIR@
 DBUS_LIBS = @DBUS_LIBS@
+DBUS_SESSIONBUSDIR = @DBUS_SESSIONBUSDIR@
+DBUS_SYSTEMBUSDIR = @DBUS_SYSTEMBUSDIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -1031,9 +2025,10 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GREP = @GREP@
-GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
-GSTREAMER_LIBS = @GSTREAMER_LIBS@
-GSTREAMER_PLUGINSDIR = @GSTREAMER_PLUGINSDIR@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+ICAL_CFLAGS = @ICAL_CFLAGS@
+ICAL_LIBS = @ICAL_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -1041,9 +2036,6 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -1074,26 +2066,21 @@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
-READLINE_LIBS = @READLINE_LIBS@
-SAP_DRIVER = @SAP_DRIVER@
+SBC_CFLAGS = @SBC_CFLAGS@
+SBC_LIBS = @SBC_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
-SNDFILE_LIBS = @SNDFILE_LIBS@
-STORAGEDIR = @STORAGEDIR@
+SPEEXDSP_CFLAGS = @SPEEXDSP_CFLAGS@
+SPEEXDSP_LIBS = @SPEEXDSP_LIBS@
 STRIP = @STRIP@
-SYSTEMD_UNITDIR = @SYSTEMD_UNITDIR@
-TELEPHONY_DRIVER = @TELEPHONY_DRIVER@
+SYSTEMD_SYSTEMUNITDIR = @SYSTEMD_SYSTEMUNITDIR@
+SYSTEMD_USERUNITDIR = @SYSTEMD_USERUNITDIR@
 UDEV_CFLAGS = @UDEV_CFLAGS@
 UDEV_DIR = @UDEV_DIR@
 UDEV_LIBS = @UDEV_LIBS@
-USB_CFLAGS = @USB_CFLAGS@
-USB_LIBS = @USB_LIBS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -1117,6 +2104,9 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+enable_coverage = @enable_coverage@
+enable_dbus_run_session = @enable_dbus_run_session@
+enable_valgrind = @enable_valgrind@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -1128,7 +2118,7 @@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
-libexecdir = @libexecdir@
+libexecdir = @libexecdir@/bluetooth
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
@@ -1147,153 +2137,240 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_MAKEFLAGS = --no-print-directory
-lib_LTLIBRARIES = lib/libbluetooth.la
-noinst_LIBRARIES = $(am__append_10) $(am__append_14)
-noinst_LTLIBRARIES = lib/libbluetooth-private.la $(am__append_1)
-dist_man_MANS = $(am__append_43) $(am__append_48) $(am__append_50) \
-	$(am__append_53) $(am__append_59) $(am__append_63) \
-	$(am__append_66) $(am__append_69)
-dist_noinst_MANS = 
-CLEANFILES = $(builtin_files) tools/lexer.c tools/parser.c \
-	tools/parser.h $(rules_DATA)
-EXTRA_DIST = plugins/hal.c plugins/formfactor.c src/genbuiltin \
-	src/bluetooth.conf src/org.bluez.service src/main.conf \
-	network/network.conf input/input.conf serial/serial.conf \
-	audio/audio.conf audio/telephony-dummy.c \
-	audio/telephony-maemo5.c audio/telephony-ofono.c \
-	audio/telephony-maemo6.c sap/sap-dummy.c sap/sap-u8500.c \
-	proximity/proximity.conf audio/bluetooth.conf $(am__append_44) \
-	tools/rfcomm.conf $(am__append_49) $(am__append_51) \
-	$(am__append_54) tools/dfubabel.1 tools/avctrl.8 \
-	$(am__append_60) $(am__append_61) test/sap-client test/hsplay \
-	test/hsmicro test/dbusdef.py test/monitor-bluetooth \
-	test/list-devices test/test-discovery test/test-manager \
-	test/test-adapter test/test-device test/test-service \
-	test/test-serial test/test-telephony test/test-network \
-	test/simple-agent test/simple-service test/simple-endpoint \
-	test/test-audio test/test-input test/test-sap-server \
-	test/test-oob test/test-attrib test/test-proximity \
-	test/test-thermometer test/test-serial-proxy test/test-health \
-	test/test-health-sink test/service-record.dtd \
-	test/service-did.xml test/service-spp.xml test/service-opp.xml \
-	test/service-ftp.xml test/simple-player test/test-nap \
-	$(am__append_64) $(am__append_67) $(am__append_70) \
-	scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \
-	doc/manager-api.txt doc/adapter-api.txt doc/device-api.txt \
-	doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
-	doc/serial-api.txt doc/network-api.txt doc/input-api.txt \
-	doc/audio-api.txt doc/control-api.txt doc/hfp-api.txt \
-	doc/health-api.txt doc/sap-api.txt doc/media-api.txt \
-	doc/assigned-numbers.txt
-include_HEADERS = $(lib_headers)
-AM_CFLAGS = $(WARNING_CFLAGS) $(MISC_CFLAGS) @DBUS_CFLAGS@ \
-	@GLIB_CFLAGS@ $(am__empty)
+lib_LTLIBRARIES = $(am__append_2)
+noinst_LIBRARIES = $(am__append_7)
+noinst_LTLIBRARIES = lib/libbluetooth-internal.la \
+	gdbus/libgdbus-internal.la src/libshared-glib.la \
+	src/libshared-mainloop.la
+dist_man_MANS = $(am__append_18) $(am__append_20)
+dist_noinst_MANS = $(am__append_36)
+CLEANFILES = $(builtin_files) src/bluetooth.service \
+	obexd/src/builtin.h $(builtin_files) obexd/src/obex.service \
+	$(am__append_33)
+EXTRA_DIST = src/bluetooth.service.in src/org.bluez.service \
+	profiles/input/suspend-dummy.c src/genbuiltin \
+	src/bluetooth.conf src/main.conf profiles/network/network.conf \
+	profiles/input/input.conf profiles/proximity/proximity.conf \
+	$(am__append_19) $(am__append_21) $(am__append_22) \
+	obexd/src/obex.service.in obexd/src/org.bluez.obex.service \
+	obexd/src/genbuiltin android/Android.mk android/README \
+	android/compat/readline/history.h \
+	android/compat/readline/readline.h android/compat/wordexp.h \
+	android/bluetoothd-wrapper.c android/log.c \
+	android/bluetoothd.te android/bluetoothd_snoop.te \
+	android/init.bluetooth.rc android/hal-ipc-api.txt \
+	android/audio-ipc-api.txt android/cts.txt \
+	android/pics-rfcomm.txt android/pics-spp.txt \
+	android/pics-sdp.txt android/pics-l2cap.txt \
+	android/pics-gap.txt android/pics-did.txt android/pics-hid.txt \
+	android/pics-pan.txt android/pics-opp.txt android/pics-map.txt \
+	android/pics-pbap.txt android/pics-a2dp.txt \
+	android/pics-avctp.txt android/pics-avrcp.txt \
+	android/pics-hsp.txt android/pics-hfp.txt \
+	android/pics-gatt.txt android/pics-mcap.txt \
+	android/pics-hdp.txt android/pics-iopt.txt android/pics-sm.txt \
+	android/pics-mps.txt android/pics-hogp.txt \
+	android/pics-scpp.txt android/pics-dis.txt \
+	android/pics-avdtp.txt android/pics-gavdp.txt \
+	android/pics-bnep.txt android/pixit-l2cap.txt \
+	android/pixit-gap.txt android/pixit-did.txt \
+	android/pixit-hid.txt android/pixit-pan.txt \
+	android/pixit-opp.txt android/pixit-map.txt \
+	android/pixit-pbap.txt android/pixit-a2dp.txt \
+	android/pixit-avctp.txt android/pixit-avrcp.txt \
+	android/pixit-hsp.txt android/pixit-hfp.txt \
+	android/pixit-gatt.txt android/pixit-mcap.txt \
+	android/pixit-hdp.txt android/pixit-iopt.txt \
+	android/pixit-sm.txt android/pixit-mps.txt \
+	android/pixit-hogp.txt android/pixit-scpp.txt \
+	android/pixit-dis.txt android/pixit-rfcomm.txt \
+	android/pixit-spp.txt android/pixit-avdtp.txt \
+	android/pixit-gavdp.txt android/pixit-sdp.txt \
+	android/pixit-bnep.txt android/pts-rfcomm.txt \
+	android/pts-spp.txt android/pts-l2cap.txt android/pts-gap.txt \
+	android/pts-did.txt android/pts-hid.txt android/pts-pan.txt \
+	android/pts-opp.txt android/pts-map.txt android/pts-a2dp.txt \
+	android/pts-avrcp.txt android/pts-avctp.txt \
+	android/pts-pbap.txt android/pts-hfp.txt android/pts-gatt.txt \
+	android/pts-hsp.txt android/pts-iopt.txt android/pts-hdp.txt \
+	android/pts-mcap.txt android/pts-mps.txt android/pts-sm.txt \
+	android/pts-hogp.txt android/pts-scpp.txt android/pts-dis.txt \
+	android/pts-avdtp.txt android/pts-gavdp.txt \
+	android/pts-sdp.txt android/pts-bnep.txt tools/hid2hci.rules \
+	$(test_scripts) doc/assigned-numbers.txt \
+	doc/supported-features.txt doc/test-coverage.txt \
+	doc/test-runner.txt doc/settings-storage.txt doc/mgmt-api.txt \
+	doc/adapter-api.txt doc/device-api.txt doc/agent-api.txt \
+	doc/profile-api.txt doc/network-api.txt doc/media-api.txt \
+	doc/health-api.txt doc/sap-api.txt doc/input-api.txt \
+	doc/alert-api.txt doc/proximity-api.txt doc/heartrate-api.txt \
+	doc/thermometer-api.txt doc/cyclingspeed-api.txt \
+	doc/gatt-api.txt doc/advertising-api.txt doc/obex-api.txt \
+	doc/obex-agent-api.txt doc/pics-opp.txt doc/pixit-opp.txt \
+	doc/pts-opp.txt tools/magic.btsnoop $(manual_pages:.1=.txt)
+include_HEADERS = $(am__append_1)
+AM_CFLAGS = $(WARNING_CFLAGS) $(MISC_CFLAGS) $(am__append_29) \
+	@DBUS_CFLAGS@ @GLIB_CFLAGS@ $(am__empty)
 AM_LDFLAGS = $(MISC_LDFLAGS)
-@DATAFILES_TRUE@dbusdir = $(sysconfdir)/dbus-1/system.d
-@DATAFILES_TRUE@dbusservicedir = $(datadir)/dbus-1/system-services
+@DATAFILES_TRUE@dbusdir = @DBUS_CONFDIR@/dbus-1/system.d
 @DATAFILES_TRUE@dbus_DATA = src/bluetooth.conf
-@DATAFILES_TRUE@dbusservice_DATA = src/org.bluez.service
 @DATAFILES_TRUE@confdir = $(sysconfdir)/bluetooth
-@DATAFILES_TRUE@conf_DATA = src/main.conf $(am__append_38)
+@DATAFILES_TRUE@conf_DATA = 
 @DATAFILES_TRUE@statedir = $(localstatedir)/lib/bluetooth
 @DATAFILES_TRUE@state_DATA = 
-@DATAFILES_TRUE@@SYSTEMD_TRUE@systemdunitdir = @SYSTEMD_UNITDIR@
-@DATAFILES_TRUE@@SYSTEMD_TRUE@systemdunit_DATA = src/bluetooth.service
+@SYSTEMD_TRUE@systemdsystemunitdir = @SYSTEMD_SYSTEMUNITDIR@
+@SYSTEMD_TRUE@systemdsystemunit_DATA = src/bluetooth.service
+@SYSTEMD_TRUE@dbussystembusdir = @DBUS_SYSTEMBUSDIR@
+@SYSTEMD_TRUE@dbussystembus_DATA = src/org.bluez.service
 plugindir = $(libdir)/bluetooth/plugins
 @MAINTAINER_MODE_FALSE@build_plugindir = $(plugindir)
 @MAINTAINER_MODE_TRUE@build_plugindir = $(abs_top_srcdir)/plugins/.libs
-plugin_LTLIBRARIES = $(am__append_37)
-lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h lib/mgmt.h \
-		lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h lib/uuid.h \
-		lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h lib/a2mp.h
+plugin_LTLIBRARIES = $(am__append_12) $(am__append_13) \
+	$(am__append_31)
+lib_sources = lib/bluetooth.c lib/hci.c lib/sdp.c
+lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h \
+		lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h \
+		lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h
 
+extra_headers = lib/mgmt.h lib/uuid.h lib/a2mp.h lib/amp.h
+extra_sources = lib/uuid.c
 local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file)))
-BUILT_SOURCES = $(local_headers) src/builtin.h
-lib_libbluetooth_la_SOURCES = $(lib_headers) \
-				lib/bluetooth.c lib/hci.c lib/sdp.c lib/uuid.c
-
-lib_libbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -version-info 16:0:13
-lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
-lib_libbluetooth_private_la_SOURCES = $(lib_libbluetooth_la_SOURCES)
-@SBC_TRUE@sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sbc.c sbc/sbc_math.h sbc/sbc_tables.h \
-@SBC_TRUE@			sbc/sbc_primitives.h sbc/sbc_primitives.c \
-@SBC_TRUE@			sbc/sbc_primitives_mmx.h sbc/sbc_primitives_mmx.c \
-@SBC_TRUE@			sbc/sbc_primitives_iwmmxt.h sbc/sbc_primitives_iwmmxt.c \
-@SBC_TRUE@			sbc/sbc_primitives_neon.h sbc/sbc_primitives_neon.c \
-@SBC_TRUE@			sbc/sbc_primitives_armv6.h sbc/sbc_primitives_armv6.c
-
-@SBC_TRUE@sbc_libsbc_la_CFLAGS = $(AM_CFLAGS) -finline-functions -fgcse-after-reload \
-@SBC_TRUE@					-funswitch-loops -funroll-loops
-
-@SBC_TRUE@sbc_sbcdec_SOURCES = sbc/sbcdec.c sbc/formats.h
-@SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la
-@SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
-@SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la
-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctester_LDADD = @SNDFILE_LIBS@ -lm
-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctest_CFLAGS = $(AM_CFLAGS) @SNDFILE_CFLAGS@
+BUILT_SOURCES = $(local_headers) src/builtin.h obexd/src/builtin.h
+@LIBRARY_TRUE@lib_libbluetooth_la_SOURCES = $(lib_headers) $(lib_sources)
+@LIBRARY_TRUE@lib_libbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -version-info 21:8:18
+@LIBRARY_TRUE@lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
+lib_libbluetooth_internal_la_SOURCES = $(lib_headers) $(lib_sources) \
+					$(extra_headers) $(extra_sources)
+
+gdbus_libgdbus_internal_la_SOURCES = gdbus/gdbus.h \
+				gdbus/mainloop.c gdbus/watch.c \
+				gdbus/object.c gdbus/client.c gdbus/polkit.c
+
+shared_sources = src/shared/io.h src/shared/timeout.h \
+			src/shared/queue.h src/shared/queue.c \
+			src/shared/util.h src/shared/util.c \
+			src/shared/mgmt.h src/shared/mgmt.c \
+			src/shared/crypto.h src/shared/crypto.c \
+			src/shared/ecc.h src/shared/ecc.c \
+			src/shared/ringbuf.h src/shared/ringbuf.c \
+			src/shared/tester.h src/shared/tester.c \
+			src/shared/hci.h src/shared/hci.c \
+			src/shared/hci-crypto.h src/shared/hci-crypto.c \
+			src/shared/hfp.h src/shared/hfp.c \
+			src/shared/uhid.h src/shared/uhid.c \
+			src/shared/pcap.h src/shared/pcap.c \
+			src/shared/btsnoop.h src/shared/btsnoop.c \
+			src/shared/ad.h src/shared/ad.c \
+			src/shared/att-types.h \
+			src/shared/att.h src/shared/att.c \
+			src/shared/gatt-helpers.h src/shared/gatt-helpers.c \
+			src/shared/gatt-client.h src/shared/gatt-client.c \
+			src/shared/gatt-server.h src/shared/gatt-server.c \
+			src/shared/gatt-db.h src/shared/gatt-db.c \
+			src/shared/gap.h src/shared/gap.c
+
+src_libshared_glib_la_SOURCES = $(shared_sources) \
+				src/shared/io-glib.c \
+				src/shared/timeout-glib.c
+
+src_libshared_mainloop_la_SOURCES = $(shared_sources) \
+				src/shared/io-mainloop.c \
+				src/shared/timeout-mainloop.c \
+				src/shared/mainloop.h src/shared/mainloop.c
+
 attrib_sources = attrib/att.h attrib/att-database.h attrib/att.c \
 		attrib/gatt.h attrib/gatt.c \
-		attrib/gattrib.h attrib/gattrib.c attrib/client.h \
-		attrib/client.c attrib/gatt-service.h attrib/gatt-service.c
-
-gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
-					gdbus/object.c gdbus/polkit.c
+		attrib/gattrib.h attrib/gattrib.c \
+		attrib/gatt-service.h attrib/gatt-service.c
 
 btio_sources = btio/btio.h btio/btio.c
-builtin_modules = $(am__append_5) $(am__append_7) $(am__append_11) \
-	$(am__append_15) $(am__append_17) $(am__append_19) \
-	$(am__append_21) $(am__append_23) $(am__append_25) hciops \
-	mgmtops $(am__append_27) $(am__append_29) storage adaptername \
-	$(am__append_31) $(am__append_33) $(am__append_35)
-builtin_sources = $(am__append_6) $(am__append_8) $(am__append_12) \
-	$(am__append_16) $(am__append_18) $(am__append_20) \
-	$(am__append_22) $(am__append_24) $(am__append_26) \
-	plugins/hciops.c plugins/mgmtops.c $(am__append_28) \
-	$(am__append_30) plugins/storage.c plugins/adaptername.c \
-	$(am__append_32) $(am__append_34) $(am__append_36)
-builtin_nodist = $(am__append_9) $(am__append_13)
-mcap_sources = $(am__append_4)
-@AUDIOPLUGIN_TRUE@audio_libtelephony_a_SOURCES = audio/telephony.h audio/telephony-dummy.c \
-@AUDIOPLUGIN_TRUE@				audio/telephony-maemo5.c audio/telephony-ofono.c \
-@AUDIOPLUGIN_TRUE@				audio/telephony-maemo6.c
-
-@SAPPLUGIN_TRUE@sap_libsap_a_SOURCES = sap/sap.h sap/sap-dummy.c sap/sap-u8500.c
+gobex_sources = gobex/gobex.h gobex/gobex.c \
+			gobex/gobex-defs.h gobex/gobex-defs.c \
+			gobex/gobex-packet.c gobex/gobex-packet.h \
+			gobex/gobex-header.c gobex/gobex-header.h \
+			gobex/gobex-transfer.c gobex/gobex-debug.h \
+			gobex/gobex-apparam.c gobex/gobex-apparam.h
+
+builtin_modules = hostname wiimote autopair policy $(am__append_3) \
+	$(am__append_5) a2dp avrcp network input hog $(am__append_8) \
+	gap scanparam deviceinfo $(am__append_10)
+builtin_sources = plugins/hostname.c plugins/wiimote.c \
+	plugins/autopair.c plugins/policy.c $(am__append_4) \
+	$(am__append_6) profiles/audio/source.h \
+	profiles/audio/source.c profiles/audio/sink.h \
+	profiles/audio/sink.c profiles/audio/a2dp.h \
+	profiles/audio/a2dp.c profiles/audio/avdtp.h \
+	profiles/audio/avdtp.c profiles/audio/media.h \
+	profiles/audio/media.c profiles/audio/transport.h \
+	profiles/audio/transport.c profiles/audio/a2dp-codecs.h \
+	profiles/audio/control.h profiles/audio/control.c \
+	profiles/audio/avctp.h profiles/audio/avctp.c \
+	profiles/audio/avrcp.h profiles/audio/avrcp.c \
+	profiles/audio/player.h profiles/audio/player.c \
+	profiles/network/manager.c profiles/network/bnep.h \
+	profiles/network/bnep.c profiles/network/server.h \
+	profiles/network/server.c profiles/network/connection.h \
+	profiles/network/connection.c profiles/input/manager.c \
+	profiles/input/server.h profiles/input/server.c \
+	profiles/input/device.h profiles/input/device.c \
+	profiles/input/hidp_defs.h profiles/input/hog.c \
+	profiles/input/uhid_copy.h profiles/input/suspend.h \
+	profiles/input/suspend-none.c $(am__append_9) \
+	profiles/gap/gas.c profiles/scanparam/scan.c \
+	profiles/deviceinfo/deviceinfo.c $(am__append_11)
+builtin_nodist = 
+@EXPERIMENTAL_TRUE@profiles_sap_libsap_a_SOURCES = profiles/sap/sap.h profiles/sap/sap-u8500.c
+@SIXAXIS_TRUE@plugins_sixaxis_la_SOURCES = plugins/sixaxis.c
+@SIXAXIS_TRUE@plugins_sixaxis_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \
+@SIXAXIS_TRUE@						-no-undefined @UDEV_LIBS@
+
+@SIXAXIS_TRUE@plugins_sixaxis_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden @UDEV_CFLAGS@
 @MAINTAINER_MODE_TRUE@plugins_external_dummy_la_SOURCES = plugins/external-dummy.c
 @MAINTAINER_MODE_TRUE@plugins_external_dummy_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \
 @MAINTAINER_MODE_TRUE@				    -no-undefined
 
 @MAINTAINER_MODE_TRUE@plugins_external_dummy_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden
-src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+src_bluetoothd_SOURCES = $(builtin_sources) \
 			$(attrib_sources) $(btio_sources) \
-			$(mcap_sources) src/bluetooth.ver \
+			src/bluetooth.ver \
 			src/main.c src/log.h src/log.c \
+			src/systemd.h src/systemd.c \
 			src/rfkill.c src/hcid.h src/sdpd.h \
 			src/sdpd-server.c src/sdpd-request.c \
 			src/sdpd-service.c src/sdpd-database.c \
 			src/attrib-server.h src/attrib-server.c \
+			src/gatt-database.h src/gatt-database.c \
 			src/sdp-xml.h src/sdp-xml.c \
 			src/sdp-client.h src/sdp-client.c \
 			src/textfile.h src/textfile.c \
-			src/glib-helper.h src/glib-helper.c \
-			src/oui.h src/oui.c src/uinput.h src/ppoll.h \
+			src/uuid-helper.h src/uuid-helper.c \
+			src/uinput.h \
 			src/plugin.h src/plugin.c \
 			src/storage.h src/storage.c \
+			src/advertising.h src/advertising.c \
 			src/agent.h src/agent.c \
 			src/error.h src/error.c \
-			src/manager.h src/manager.c \
 			src/adapter.h src/adapter.c \
+			src/profile.h src/profile.c \
+			src/service.h src/service.c \
+			src/gatt-client.h src/gatt-client.c \
 			src/device.h src/device.c src/attio.h \
 			src/dbus-common.c src/dbus-common.h \
-			src/event.h src/event.c \
-			src/oob.h src/oob.c src/eir.h src/eir.c
+			src/eir.h src/eir.c
 
-src_bluetoothd_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @DBUS_LIBS@ \
-								-ldl -lrt
+src_bluetoothd_LDADD = lib/libbluetooth-internal.la \
+			gdbus/libgdbus-internal.la \
+			src/libshared-glib.la \
+			@GLIB_LIBS@ @DBUS_LIBS@ -ldl -lrt
 
 src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \
 				-Wl,--version-script=$(srcdir)/src/bluetooth.ver
 
-src_bluetoothd_DEPENDENCIES = lib/libbluetooth-private.la
+src_bluetoothd_DEPENDENCIES = lib/libbluetooth-internal.la \
+				gdbus/libgdbus-internal.la \
+				src/libshared-glib.la \
+				src/bluetooth.service
+
 src_bluetoothd_CFLAGS = $(AM_CFLAGS) -DBLUETOOTH_PLUGIN_BUILTIN \
 					-DPLUGINDIR=\""$(build_plugindir)"\"
 
@@ -1301,191 +2378,717 @@
 builtin_files = src/builtin.h $(builtin_nodist)
 nodist_src_bluetoothd_SOURCES = $(builtin_files)
 man_MANS = src/bluetoothd.8
-@ALSA_TRUE@alsadir = $(libdir)/alsa-lib
-@ALSA_TRUE@alsa_LTLIBRARIES = audio/libasound_module_pcm_bluetooth.la \
-@ALSA_TRUE@				audio/libasound_module_ctl_bluetooth.la
-
-@ALSA_TRUE@audio_libasound_module_pcm_bluetooth_la_SOURCES = audio/pcm_bluetooth.c \
-@ALSA_TRUE@					audio/rtp.h audio/ipc.h audio/ipc.c
-
-@ALSA_TRUE@audio_libasound_module_pcm_bluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module \
-@ALSA_TRUE@						  -avoid-version
-
-@ALSA_TRUE@audio_libasound_module_pcm_bluetooth_la_LIBADD = sbc/libsbc.la \
-@ALSA_TRUE@					lib/libbluetooth-private.la @ALSA_LIBS@
-
-@ALSA_TRUE@audio_libasound_module_pcm_bluetooth_la_CFLAGS = $(AM_CFLAGS) @ALSA_CFLAGS@
-@ALSA_TRUE@audio_libasound_module_ctl_bluetooth_la_SOURCES = audio/ctl_bluetooth.c \
-@ALSA_TRUE@					audio/rtp.h audio/ipc.h audio/ipc.c
-
-@ALSA_TRUE@audio_libasound_module_ctl_bluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module \
-@ALSA_TRUE@						  -avoid-version
-
-@ALSA_TRUE@audio_libasound_module_ctl_bluetooth_la_LIBADD = \
-@ALSA_TRUE@					lib/libbluetooth-private.la @ALSA_LIBS@
-
-@ALSA_TRUE@audio_libasound_module_ctl_bluetooth_la_CFLAGS = $(AM_CFLAGS) @ALSA_CFLAGS@
-@ALSA_TRUE@@DATAFILES_TRUE@alsaconfdir = $(datadir)/alsa
-@ALSA_TRUE@@DATAFILES_TRUE@alsaconf_DATA = audio/bluetooth.conf
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@gstreamerdir = $(libdir)/gstreamer-0.10
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@gstreamer_LTLIBRARIES = audio/libgstbluetooth.la
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@audio_libgstbluetooth_la_SOURCES = audio/gstbluetooth.c audio/gstpragma.h \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@				audio/gstsbcenc.h audio/gstsbcenc.c \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@				audio/gstsbcdec.h audio/gstsbcdec.c \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@				audio/gstsbcparse.h audio/gstsbcparse.c \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@				audio/gstavdtpsink.h audio/gstavdtpsink.c \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@				audio/gsta2dpsink.h audio/gsta2dpsink.c \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@				audio/gstsbcutil.h audio/gstsbcutil.c \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@				audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@				audio/rtp.h audio/ipc.h audio/ipc.c
-
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@audio_libgstbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth-private.la \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@						@DBUS_LIBS@ @GSTREAMER_LIBS@ \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@						-lgstaudio-0.10 -lgstrtp-0.10
-
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@audio_libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \
-@AUDIOPLUGIN_TRUE@@GSTREAMER_TRUE@                               $(AM_CFLAGS) @DBUS_CFLAGS@ @GSTREAMER_CFLAGS@
-
-@TOOLS_TRUE@tools_rfcomm_SOURCES = tools/rfcomm.c tools/parser.y tools/lexer.l \
-@TOOLS_TRUE@					tools/kword.h tools/kword.c
-
-@TOOLS_TRUE@EXTRA_tools_rfcomm_SOURCES = tools/parser.h tools/parser.c \
-@TOOLS_TRUE@							tools/lexer.c
-
-@TOOLS_TRUE@tools_rfcomm_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@tools_l2ping_LDADD = lib/libbluetooth-private.la
+test_scripts = test/sap_client.py test/bluezutils.py test/dbusdef.py \
+	test/monitor-bluetooth test/list-devices test/test-discovery \
+	test/test-manager test/test-adapter test/test-device \
+	test/simple-agent test/simple-endpoint test/test-sap-server \
+	test/test-proximity test/test-network test/test-thermometer \
+	test/test-profile test/test-health test/test-health-sink \
+	test/service-record.dtd test/service-did.xml \
+	test/service-spp.xml test/service-opp.xml test/service-ftp.xml \
+	test/simple-player test/test-nap test/test-heartrate \
+	test/test-alert test/test-hfp test/test-cyclingspeed \
+	test/opp-client test/ftp-client test/pbap-client \
+	test/map-client test/example-advertisement \
+	test/example-gatt-server test/example-gatt-client \
+	test/test-gatt-profile
+unit_tests = $(am__append_32) unit/test-eir unit/test-uuid \
+	unit/test-textfile unit/test-crc unit/test-crypto \
+	unit/test-ecc unit/test-ringbuf unit/test-queue unit/test-mgmt \
+	unit/test-uhid unit/test-sdp unit/test-avdtp unit/test-avctp \
+	unit/test-avrcp unit/test-hfp unit/test-gdbus-client \
+	unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \
+	unit/test-gobex-transfer unit/test-gobex-apparam unit/test-lib \
+	unit/test-gatt unit/test-hog unit/test-gattrib
+@CLIENT_TRUE@client_bluetoothctl_SOURCES = client/main.c \
+@CLIENT_TRUE@					client/display.h client/display.c \
+@CLIENT_TRUE@					client/agent.h client/agent.c \
+@CLIENT_TRUE@					client/gatt.h client/gatt.c \
+@CLIENT_TRUE@					monitor/uuid.h monitor/uuid.c
+
+@CLIENT_TRUE@client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ \
+@CLIENT_TRUE@				-lreadline
+
+@MONITOR_TRUE@monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
+@MONITOR_TRUE@				monitor/display.h monitor/display.c \
+@MONITOR_TRUE@				monitor/hcidump.h monitor/hcidump.c \
+@MONITOR_TRUE@				monitor/ellisys.h monitor/ellisys.c \
+@MONITOR_TRUE@				monitor/control.h monitor/control.c \
+@MONITOR_TRUE@				monitor/packet.h monitor/packet.c \
+@MONITOR_TRUE@				monitor/vendor.h monitor/vendor.c \
+@MONITOR_TRUE@				monitor/lmp.h monitor/lmp.c \
+@MONITOR_TRUE@				monitor/crc.h monitor/crc.c \
+@MONITOR_TRUE@				monitor/ll.h monitor/ll.c \
+@MONITOR_TRUE@				monitor/l2cap.h monitor/l2cap.c \
+@MONITOR_TRUE@				monitor/sdp.h monitor/sdp.c \
+@MONITOR_TRUE@				monitor/avctp.h monitor/avctp.c \
+@MONITOR_TRUE@				monitor/rfcomm.h monitor/rfcomm.c \
+@MONITOR_TRUE@				monitor/bnep.h monitor/bnep.c \
+@MONITOR_TRUE@				monitor/uuid.h monitor/uuid.c \
+@MONITOR_TRUE@				monitor/hwdb.h monitor/hwdb.c \
+@MONITOR_TRUE@				monitor/keys.h monitor/keys.c \
+@MONITOR_TRUE@				monitor/analyze.h monitor/analyze.c
+
+@MONITOR_TRUE@monitor_btmon_LDADD = lib/libbluetooth-internal.la \
+@MONITOR_TRUE@				src/libshared-mainloop.la @UDEV_LIBS@
+
+@EXPERIMENTAL_TRUE@emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/serial.h emulator/serial.c \
+@EXPERIMENTAL_TRUE@				emulator/server.h emulator/server.c \
+@EXPERIMENTAL_TRUE@				emulator/vhci.h emulator/vhci.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c \
+@EXPERIMENTAL_TRUE@				emulator/phy.h emulator/phy.c \
+@EXPERIMENTAL_TRUE@				emulator/amp.h emulator/amp.c \
+@EXPERIMENTAL_TRUE@				emulator/le.h emulator/le.c
+
+@EXPERIMENTAL_TRUE@emulator_btvirt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@emulator_b1ee_SOURCES = emulator/b1ee.c
+@EXPERIMENTAL_TRUE@emulator_b1ee_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@emulator_hfp_SOURCES = emulator/hfp.c
+@EXPERIMENTAL_TRUE@emulator_hfp_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@peripheral_btsensor_SOURCES = peripheral/main.c \
+@EXPERIMENTAL_TRUE@				peripheral/efivars.h peripheral/efivars.c \
+@EXPERIMENTAL_TRUE@				peripheral/attach.h peripheral/attach.c \
+@EXPERIMENTAL_TRUE@				peripheral/log.h peripheral/log.c \
+@EXPERIMENTAL_TRUE@				peripheral/gap.h peripheral/gap.c \
+@EXPERIMENTAL_TRUE@				peripheral/gatt.h peripheral/gatt.c
+
+@EXPERIMENTAL_TRUE@peripheral_btsensor_LDADD = src/libshared-mainloop.la \
+@EXPERIMENTAL_TRUE@				lib/libbluetooth-internal.la
+
+@EXPERIMENTAL_TRUE@tools_3dsp_SOURCES = tools/3dsp.c monitor/bt.h
+@EXPERIMENTAL_TRUE@tools_3dsp_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_mgmt_tester_SOURCES = tools/mgmt-tester.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/hciemu.h emulator/hciemu.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c
+
+@EXPERIMENTAL_TRUE@tools_mgmt_tester_LDADD = lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@				src/libshared-glib.la @GLIB_LIBS@
+
+@EXPERIMENTAL_TRUE@tools_l2cap_tester_SOURCES = tools/l2cap-tester.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/hciemu.h emulator/hciemu.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c
+
+@EXPERIMENTAL_TRUE@tools_l2cap_tester_LDADD = lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@				src/libshared-glib.la @GLIB_LIBS@
+
+@EXPERIMENTAL_TRUE@tools_rfcomm_tester_SOURCES = tools/rfcomm-tester.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/hciemu.h emulator/hciemu.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c
+
+@EXPERIMENTAL_TRUE@tools_rfcomm_tester_LDADD = lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@				src/libshared-glib.la @GLIB_LIBS@
+
+@EXPERIMENTAL_TRUE@tools_bnep_tester_SOURCES = tools/bnep-tester.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/hciemu.h emulator/hciemu.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c
+
+@EXPERIMENTAL_TRUE@tools_bnep_tester_LDADD = lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@				src/libshared-glib.la @GLIB_LIBS@
+
+@EXPERIMENTAL_TRUE@tools_smp_tester_SOURCES = tools/smp-tester.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/hciemu.h emulator/hciemu.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c
+
+@EXPERIMENTAL_TRUE@tools_smp_tester_LDADD = lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@				src/libshared-glib.la @GLIB_LIBS@
+
+@EXPERIMENTAL_TRUE@tools_gap_tester_SOURCES = tools/gap-tester.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/hciemu.h emulator/hciemu.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c
+
+@EXPERIMENTAL_TRUE@tools_gap_tester_LDADD = lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@				gdbus/libgdbus-internal.la \
+@EXPERIMENTAL_TRUE@				src/libshared-glib.la \
+@EXPERIMENTAL_TRUE@				@GLIB_LIBS@ @DBUS_LIBS@
+
+@EXPERIMENTAL_TRUE@tools_sco_tester_SOURCES = tools/sco-tester.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/hciemu.h emulator/hciemu.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c
+
+@EXPERIMENTAL_TRUE@tools_sco_tester_LDADD = lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@				src/libshared-glib.la @GLIB_LIBS@
+
+@EXPERIMENTAL_TRUE@tools_hci_tester_SOURCES = tools/hci-tester.c monitor/bt.h
+@EXPERIMENTAL_TRUE@tools_hci_tester_LDADD = src/libshared-glib.la @GLIB_LIBS@
+@EXPERIMENTAL_TRUE@tools_userchan_tester_SOURCES = tools/userchan-tester.c monitor/bt.h \
+@EXPERIMENTAL_TRUE@				emulator/hciemu.h emulator/hciemu.c \
+@EXPERIMENTAL_TRUE@				emulator/btdev.h emulator/btdev.c \
+@EXPERIMENTAL_TRUE@				emulator/bthost.h emulator/bthost.c \
+@EXPERIMENTAL_TRUE@				emulator/smp.c
+
+@EXPERIMENTAL_TRUE@tools_userchan_tester_LDADD = lib/libbluetooth-internal.la \
+@EXPERIMENTAL_TRUE@				src/libshared-glib.la @GLIB_LIBS@
+
 @TOOLS_TRUE@tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
 @TOOLS_TRUE@						tools/hciattach_st.c \
 @TOOLS_TRUE@						tools/hciattach_ti.c \
 @TOOLS_TRUE@						tools/hciattach_tialt.c \
 @TOOLS_TRUE@						tools/hciattach_ath3k.c \
 @TOOLS_TRUE@						tools/hciattach_qualcomm.c \
-@TOOLS_TRUE@						tools/hciattach_intel.c
-
-@TOOLS_TRUE@tools_hciattach_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c \
-@TOOLS_TRUE@						src/textfile.h src/textfile.c
-
-@TOOLS_TRUE@tools_hciconfig_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c \
-@TOOLS_TRUE@						src/textfile.h src/textfile.c
-
-@TOOLS_TRUE@tools_hcitool_LDADD = lib/libbluetooth-private.la
+@TOOLS_TRUE@						tools/hciattach_intel.c \
+@TOOLS_TRUE@						tools/hciattach_bcm43xx.c
+
+@TOOLS_TRUE@tools_hciattach_LDADD = lib/libbluetooth-internal.la
+@TOOLS_TRUE@tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c
+@TOOLS_TRUE@tools_hciconfig_LDADD = lib/libbluetooth-internal.la
+@TOOLS_TRUE@tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c
+@TOOLS_TRUE@tools_hcitool_LDADD = lib/libbluetooth-internal.la @UDEV_LIBS@
+@TOOLS_TRUE@tools_hcidump_SOURCES = tools/hcidump.c \
+@TOOLS_TRUE@				tools/parser/parser.h tools/parser/parser.c \
+@TOOLS_TRUE@				tools/parser/lmp.c \
+@TOOLS_TRUE@				tools/parser/hci.c \
+@TOOLS_TRUE@				tools/parser/l2cap.h tools/parser/l2cap.c \
+@TOOLS_TRUE@				tools/parser/amp.c \
+@TOOLS_TRUE@				tools/parser/smp.c \
+@TOOLS_TRUE@				tools/parser/att.c \
+@TOOLS_TRUE@				tools/parser/sdp.h tools/parser/sdp.c \
+@TOOLS_TRUE@				tools/parser/rfcomm.h tools/parser/rfcomm.c \
+@TOOLS_TRUE@				tools/parser/bnep.c \
+@TOOLS_TRUE@				tools/parser/cmtp.c \
+@TOOLS_TRUE@				tools/parser/hidp.c \
+@TOOLS_TRUE@				tools/parser/hcrp.c \
+@TOOLS_TRUE@				tools/parser/avdtp.c \
+@TOOLS_TRUE@				tools/parser/avctp.c \
+@TOOLS_TRUE@				tools/parser/avrcp.c \
+@TOOLS_TRUE@				tools/parser/sap.c \
+@TOOLS_TRUE@				tools/parser/obex.c \
+@TOOLS_TRUE@				tools/parser/capi.c \
+@TOOLS_TRUE@				tools/parser/ppp.c \
+@TOOLS_TRUE@				tools/parser/tcpip.c \
+@TOOLS_TRUE@				tools/parser/ericsson.c \
+@TOOLS_TRUE@				tools/parser/csr.c \
+@TOOLS_TRUE@				tools/parser/bpa.c
+
+@TOOLS_TRUE@tools_hcidump_LDADD = lib/libbluetooth-internal.la
+@TOOLS_TRUE@tools_rfcomm_LDADD = lib/libbluetooth-internal.la
+@TOOLS_TRUE@tools_rctest_LDADD = lib/libbluetooth-internal.la
+@TOOLS_TRUE@tools_l2test_LDADD = lib/libbluetooth-internal.la
+@TOOLS_TRUE@tools_l2ping_LDADD = lib/libbluetooth-internal.la
 @TOOLS_TRUE@tools_sdptool_SOURCES = tools/sdptool.c src/sdp-xml.h src/sdp-xml.c
-@TOOLS_TRUE@tools_sdptool_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@tools_ciptool_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@tools_avinfo_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@tools_ppporc_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@tools_hcieventmask_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@mgmt_btmgmt_SOURCES = mgmt/main.c src/glib-helper.c
-@TOOLS_TRUE@mgmt_btmgmt_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
-@TOOLS_TRUE@monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
-@TOOLS_TRUE@					monitor/mainloop.h monitor/mainloop.c \
-@TOOLS_TRUE@					monitor/hcidump.h monitor/hcidump.c \
-@TOOLS_TRUE@					monitor/btsnoop.h monitor/btsnoop.c \
-@TOOLS_TRUE@					monitor/control.h monitor/control.c \
-@TOOLS_TRUE@					monitor/packet.h monitor/packet.c
-
-@TOOLS_TRUE@monitor_btmon_LDADD = lib/libbluetooth-private.la
-@TOOLS_TRUE@emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \
-@TOOLS_TRUE@					monitor/mainloop.h monitor/mainloop.c \
-@TOOLS_TRUE@					emulator/server.h emulator/server.c \
-@TOOLS_TRUE@					emulator/vhci.h emulator/vhci.c \
-@TOOLS_TRUE@					emulator/btdev.h emulator/btdev.c
-
-@READLINE_TRUE@@TOOLS_TRUE@attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
-@READLINE_TRUE@@TOOLS_TRUE@				attrib/gattrib.c btio/btio.c \
-@READLINE_TRUE@@TOOLS_TRUE@				attrib/gatttool.h attrib/interactive.c \
-@READLINE_TRUE@@TOOLS_TRUE@				attrib/utils.c src/log.c
-
-@READLINE_TRUE@@TOOLS_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @READLINE_LIBS@
-@BCCMD_TRUE@tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h \
-@BCCMD_TRUE@	tools/csr.c tools/csr_hci.c tools/csr_h4.c \
-@BCCMD_TRUE@	tools/csr_3wire.c tools/csr_bcsp.c tools/ubcsp.h \
-@BCCMD_TRUE@	tools/ubcsp.c $(am__append_46)
-@BCCMD_TRUE@tools_bccmd_LDADD = lib/libbluetooth-private.la \
-@BCCMD_TRUE@	$(am__append_47)
-@DATAFILES_TRUE@@PCMCIA_TRUE@udevdir = @UDEV_DIR@
+@TOOLS_TRUE@tools_sdptool_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+@TOOLS_TRUE@tools_ciptool_LDADD = lib/libbluetooth-internal.la
+@TOOLS_TRUE@tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
+@TOOLS_TRUE@			tools/csr_hci.c tools/csr_usb.c \
+@TOOLS_TRUE@			tools/csr_h4.c tools/csr_3wire.c \
+@TOOLS_TRUE@			tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
+
+@TOOLS_TRUE@tools_bccmd_LDADD = lib/libbluetooth-internal.la
+@TOOLS_TRUE@tools_bluemoon_SOURCES = tools/bluemoon.c monitor/bt.h
+@TOOLS_TRUE@tools_bluemoon_LDADD = src/libshared-mainloop.la
+@TOOLS_TRUE@tools_hex2hcd_SOURCES = tools/hex2hcd.c
+@TOOLS_TRUE@tools_mpris_proxy_SOURCES = tools/mpris-proxy.c
+@TOOLS_TRUE@tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
 @HID2HCI_TRUE@udevdir = @UDEV_DIR@
-@HID2HCI_TRUE@tools_hid2hci_LDADD = @USB_LIBS@ @UDEV_LIBS@
-@DFUTOOL_TRUE@tools_dfutool_SOURCES = tools/dfutool.c tools/dfu.h tools/dfu.c
-@DFUTOOL_TRUE@tools_dfutool_LDADD = @USB_LIBS@
-@USB_TRUE@tools_dfubabel_LDADD = @USB_LIBS@
-@USB_TRUE@tools_avctrl_LDADD = @USB_LIBS@
+@HID2HCI_TRUE@tools_hid2hci_LDADD = @UDEV_LIBS@
+@EXPERIMENTAL_TRUE@tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
+@EXPERIMENTAL_TRUE@tools_bdaddr_LDADD = lib/libbluetooth-internal.la @UDEV_LIBS@
+@EXPERIMENTAL_TRUE@tools_avinfo_LDADD = lib/libbluetooth-internal.la
+@EXPERIMENTAL_TRUE@tools_avtest_LDADD = lib/libbluetooth-internal.la
+@EXPERIMENTAL_TRUE@tools_scotest_LDADD = lib/libbluetooth-internal.la
+@EXPERIMENTAL_TRUE@tools_amptest_LDADD = lib/libbluetooth-internal.la
+@EXPERIMENTAL_TRUE@tools_hwdb_LDADD = lib/libbluetooth-internal.la
+@EXPERIMENTAL_TRUE@tools_hcieventmask_LDADD = lib/libbluetooth-internal.la
+@EXPERIMENTAL_TRUE@tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h
+@EXPERIMENTAL_TRUE@tools_btinfo_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_btattach_SOURCES = tools/btattach.c monitor/bt.h
+@EXPERIMENTAL_TRUE@tools_btattach_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_btsnoop_SOURCES = tools/btsnoop.c
+@EXPERIMENTAL_TRUE@tools_btsnoop_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_btproxy_SOURCES = tools/btproxy.c monitor/bt.h
+@EXPERIMENTAL_TRUE@tools_btproxy_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_btiotest_SOURCES = tools/btiotest.c btio/btio.h btio/btio.c
+@EXPERIMENTAL_TRUE@tools_btiotest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+@EXPERIMENTAL_TRUE@tools_mcaptest_SOURCES = tools/mcaptest.c \
+@EXPERIMENTAL_TRUE@				btio/btio.h btio/btio.c \
+@EXPERIMENTAL_TRUE@				src/log.c src/log.h \
+@EXPERIMENTAL_TRUE@				profiles/health/mcap.h profiles/health/mcap.c
+
+@EXPERIMENTAL_TRUE@tools_mcaptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+@EXPERIMENTAL_TRUE@tools_bneptest_SOURCES = tools/bneptest.c \
+@EXPERIMENTAL_TRUE@				btio/btio.h btio/btio.c \
+@EXPERIMENTAL_TRUE@				src/log.h src/log.c \
+@EXPERIMENTAL_TRUE@				profiles/network/bnep.h profiles/network/bnep.c
+
+@EXPERIMENTAL_TRUE@tools_bneptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+@EXPERIMENTAL_TRUE@tools_cltest_SOURCES = tools/cltest.c
+@EXPERIMENTAL_TRUE@tools_cltest_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_oobtest_SOURCES = tools/oobtest.c
+@EXPERIMENTAL_TRUE@tools_oobtest_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_seq2bseq_SOURCES = tools/seq2bseq.c
+@EXPERIMENTAL_TRUE@tools_nokfw_SOURCES = tools/nokfw.c
+@EXPERIMENTAL_TRUE@tools_create_image_SOURCES = tools/create-image.c
+@EXPERIMENTAL_TRUE@tools_eddystone_SOURCES = tools/eddystone.c monitor/bt.h
+@EXPERIMENTAL_TRUE@tools_eddystone_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_ibeacon_SOURCES = tools/ibeacon.c monitor/bt.h
+@EXPERIMENTAL_TRUE@tools_ibeacon_LDADD = src/libshared-mainloop.la
+@EXPERIMENTAL_TRUE@tools_btgatt_client_SOURCES = tools/btgatt-client.c src/uuid-helper.c
+@EXPERIMENTAL_TRUE@tools_btgatt_client_LDADD = src/libshared-mainloop.la \
+@EXPERIMENTAL_TRUE@						lib/libbluetooth-internal.la
+
+@EXPERIMENTAL_TRUE@tools_btgatt_server_SOURCES = tools/btgatt-server.c src/uuid-helper.c
+@EXPERIMENTAL_TRUE@tools_btgatt_server_LDADD = src/libshared-mainloop.la \
+@EXPERIMENTAL_TRUE@						lib/libbluetooth-internal.la
+
+@READLINE_TRUE@attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
+@READLINE_TRUE@				attrib/gattrib.c btio/btio.c \
+@READLINE_TRUE@				attrib/gatttool.h attrib/interactive.c \
+@READLINE_TRUE@				attrib/utils.c src/log.c client/display.c \
+@READLINE_TRUE@				client/display.h
+
+@READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
+@READLINE_TRUE@			src/libshared-glib.la @GLIB_LIBS@ -lreadline
+
+@READLINE_TRUE@tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \
+@READLINE_TRUE@						tools/obex-client-tool.c
+
+@READLINE_TRUE@tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \
+@READLINE_TRUE@						@GLIB_LIBS@ -lreadline
+
+@READLINE_TRUE@tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
+@READLINE_TRUE@						tools/obex-server-tool.c
+
+@READLINE_TRUE@tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+@READLINE_TRUE@tools_bluetooth_player_SOURCES = tools/bluetooth-player.c \
+@READLINE_TRUE@				client/display.h client/display.c
+
+@READLINE_TRUE@tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
+@READLINE_TRUE@				@GLIB_LIBS@ @DBUS_LIBS@ -lreadline
+
+@READLINE_TRUE@tools_obexctl_SOURCES = tools/obexctl.c \
+@READLINE_TRUE@				client/display.h client/display.c
+
+@READLINE_TRUE@tools_obexctl_LDADD = gdbus/libgdbus-internal.la \
+@READLINE_TRUE@				@GLIB_LIBS@ @DBUS_LIBS@ -lreadline
+
+@READLINE_TRUE@tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c
+@READLINE_TRUE@tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \
+@READLINE_TRUE@				-lreadline
+
+@EXPERIMENTAL_TRUE@tools_gatt_service_SOURCES = tools/gatt-service.c
+@EXPERIMENTAL_TRUE@tools_gatt_service_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ gdbus/libgdbus-internal.la
+@EXPERIMENTAL_TRUE@profiles_iap_iapd_SOURCES = profiles/iap/main.c
+@EXPERIMENTAL_TRUE@profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
 @CUPS_TRUE@cupsdir = $(libdir)/cups/backend
-@CUPS_TRUE@cups_bluetooth_SOURCES = $(gdbus_sources) cups/main.c cups/cups.h \
-@CUPS_TRUE@					cups/sdp.c cups/spp.c cups/hcrp.c
-
-@CUPS_TRUE@cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ lib/libbluetooth-private.la
-@TEST_TRUE@test_hciemu_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_l2test_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_rctest_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_gaptest_LDADD = @DBUS_LIBS@
-@TEST_TRUE@test_sdptest_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_scotest_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_attest_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_hstest_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_avtest_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_lmptest_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_ipctest_SOURCES = test/ipctest.c audio/ipc.h audio/ipc.c
-@TEST_TRUE@test_ipctest_LDADD = @GLIB_LIBS@ sbc/libsbc.la
-@TEST_TRUE@test_bdaddr_SOURCES = test/bdaddr.c src/oui.h src/oui.c
-@TEST_TRUE@test_bdaddr_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_agent_LDADD = @DBUS_LIBS@
-@TEST_TRUE@test_btiotest_SOURCES = test/btiotest.c btio/btio.h btio/btio.c
-@TEST_TRUE@test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth-private.la
-@TEST_TRUE@test_uuidtest_SOURCES = test/uuidtest.c
-@TEST_TRUE@test_uuidtest_LDADD = lib/libbluetooth-private.la
-@TEST_TRUE@test_mpris_player_SOURCES = test/mpris-player.c
-@TEST_TRUE@test_mpris_player_LDADD = @DBUS_LIBS@ @GLIB_LIBS@
-@TEST_TRUE@test_test_textfile_SOURCES = test/test-textfile.c src/textfile.h src/textfile.c
-@HIDD_TRUE@compat_hidd_SOURCES = compat/hidd.c compat/hidd.h src/uinput.h \
-@HIDD_TRUE@				compat/sdp.h compat/sdp.c compat/fakehid.c \
-@HIDD_TRUE@						src/textfile.h src/textfile.c
-
-@HIDD_TRUE@compat_hidd_LDADD = -lm lib/libbluetooth-private.la
-@PAND_TRUE@compat_pand_SOURCES = compat/pand.c compat/pand.h \
-@PAND_TRUE@				compat/bnep.c compat/sdp.h compat/sdp.c \
-@PAND_TRUE@						src/textfile.h src/textfile.c
-
-@PAND_TRUE@compat_pand_LDADD = lib/libbluetooth-private.la
-@DUND_TRUE@compat_dund_SOURCES = compat/dund.c compat/dund.h compat/lib.h \
-@DUND_TRUE@			compat/sdp.h compat/sdp.c compat/dun.c compat/msdun.c \
-@DUND_TRUE@						src/textfile.h src/textfile.c
-
-@DUND_TRUE@compat_dund_LDADD = lib/libbluetooth-private.la
-@DATAFILES_TRUE@rulesdir = @UDEV_DIR@/rules.d
-@DATAFILES_TRUE@udev_files = $(am__append_71) $(am__append_72)
-@DATAFILES_TRUE@@PCMCIA_TRUE@dist_udev_SCRIPTS = scripts/bluetooth_serial
-@DATAFILES_TRUE@rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file)))
-AM_YFLAGS = -d
-INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
-	-I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \
-	-I$(srcdir)/attrib -I$(srcdir)/btio -I$(srcdir)/tools \
-	-I$(builddir)/tools -I$(srcdir)/monitor $(am__append_73)
-unit_objects = $(am__append_74)
-@TEST_FALSE@unit_tests = 
-@TEST_TRUE@unit_tests = unit/test-eir
-@TEST_TRUE@unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
-@TEST_TRUE@unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
-@TEST_TRUE@unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
+@CUPS_TRUE@profiles_cups_bluetooth_SOURCES = profiles/cups/main.c \
+@CUPS_TRUE@					profiles/cups/cups.h \
+@CUPS_TRUE@					profiles/cups/sdp.c \
+@CUPS_TRUE@					profiles/cups/spp.c \
+@CUPS_TRUE@					profiles/cups/hcrp.c
+
+@CUPS_TRUE@profiles_cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ \
+@CUPS_TRUE@				lib/libbluetooth-internal.la \
+@CUPS_TRUE@				gdbus/libgdbus-internal.la
+
+@SYSTEMD_TRUE@systemduserunitdir = @SYSTEMD_USERUNITDIR@
+@SYSTEMD_TRUE@systemduserunit_DATA = obexd/src/obex.service
+@SYSTEMD_TRUE@dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+@SYSTEMD_TRUE@dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+obex_plugindir = $(libdir)/obex/plugins
+obexd_builtin_modules = filesystem bluetooth $(am__append_25) opp ftp \
+	$(am__append_27) mas mns
+obexd_builtin_sources = obexd/plugins/filesystem.c \
+	obexd/plugins/filesystem.h obexd/plugins/bluetooth.c \
+	$(am__append_26) obexd/plugins/opp.c obexd/plugins/ftp.c \
+	obexd/plugins/ftp.h $(am__append_28) obexd/plugins/mas.c \
+	obexd/src/map_ap.h obexd/plugins/messages.h \
+	obexd/plugins/messages-dummy.c obexd/client/mns.c \
+	obexd/src/map_ap.h obexd/client/map-event.h
+obexd_builtin_nodist = 
+obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \
+			$(obexd_builtin_sources) \
+			obexd/src/main.c obexd/src/obexd.h \
+			obexd/src/plugin.h obexd/src/plugin.c \
+			obexd/src/log.h obexd/src/log.c \
+			obexd/src/manager.h obexd/src/manager.c \
+			obexd/src/obex.h obexd/src/obex.c obexd/src/obex-priv.h \
+			obexd/src/mimetype.h obexd/src/mimetype.c \
+			obexd/src/service.h obexd/src/service.c \
+			obexd/src/transport.h obexd/src/transport.c \
+			obexd/src/server.h obexd/src/server.c \
+			obexd/client/manager.h obexd/client/manager.c \
+			obexd/client/session.h obexd/client/session.c \
+			obexd/client/bluetooth.h obexd/client/bluetooth.c \
+			obexd/client/sync.h obexd/client/sync.c \
+			obexd/client/pbap.h obexd/client/pbap.c \
+			obexd/client/ftp.h obexd/client/ftp.c \
+			obexd/client/opp.h obexd/client/opp.c \
+			obexd/client/map.h obexd/client/map.c \
+			obexd/client/map-event.h obexd/client/map-event.c \
+			obexd/client/transfer.h obexd/client/transfer.c \
+			obexd/client/transport.h obexd/client/transport.c \
+			obexd/client/dbus.h obexd/client/dbus.c \
+			obexd/client/driver.h obexd/client/driver.c \
+			obexd/src/map_ap.h
+
+obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
+			gdbus/libgdbus-internal.la \
+			@ICAL_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ -ldl
+
+obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic
+obexd_src_obexd_CFLAGS = $(AM_CFLAGS) @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
+				@ICAL_CFLAGS@ -DOBEX_PLUGIN_BUILTIN \
+				-DPLUGINDIR=\""$(obex_plugindir)"\" \
+				-fPIC -D_FILE_OFFSET_BITS=64
+
+obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src
+obexd_src_obexd_SHORTNAME = obexd
+obexd_builtin_files = obexd/src/builtin.h $(obexd_builtin_nodist)
+nodist_obexd_src_obexd_SOURCES = $(obexd_builtin_files)
+@ANDROID_TRUE@android_plugindir = $(abs_top_srcdir)/android/.libs
+@ANDROID_TRUE@android_system_emulator_SOURCES = android/system-emulator.c
+@ANDROID_TRUE@android_system_emulator_LDADD = src/libshared-mainloop.la
+@ANDROID_TRUE@android_bluetoothd_snoop_SOURCES = android/bluetoothd-snoop.c src/log.c
+@ANDROID_TRUE@android_bluetoothd_snoop_LDADD = src/libshared-mainloop.la @GLIB_LIBS@
+@ANDROID_TRUE@android_bluetoothd_SOURCES = android/main.c \
+@ANDROID_TRUE@				src/log.c \
+@ANDROID_TRUE@				android/hal-msg.h \
+@ANDROID_TRUE@				android/audio-msg.h \
+@ANDROID_TRUE@				android/sco-msg.h \
+@ANDROID_TRUE@				android/utils.h \
+@ANDROID_TRUE@				src/sdpd-database.c src/sdpd-server.c \
+@ANDROID_TRUE@				src/sdpd-service.c src/sdpd-request.c \
+@ANDROID_TRUE@				src/uuid-helper.h src/uuid-helper.c \
+@ANDROID_TRUE@				src/eir.h src/eir.c \
+@ANDROID_TRUE@				android/bluetooth.h android/bluetooth.c \
+@ANDROID_TRUE@				android/hidhost.h android/hidhost.c \
+@ANDROID_TRUE@				android/scpp.h android/scpp.c \
+@ANDROID_TRUE@				android/dis.h android/dis.c \
+@ANDROID_TRUE@				android/bas.h android/bas.c \
+@ANDROID_TRUE@				android/hog.h android/hog.c \
+@ANDROID_TRUE@				android/ipc-common.h \