From caad5322f6117ab53bacc5d1999b055f7839beab Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Wed, 16 Jan 2013 10:31:27 -0300 Subject: bluetooth: Rename bluetooth plugins As BlueZ 5 introduced backwards incompatible API changes, and we want to keep support for BlueZ 4 based plugins for some time, we need to separate the plugins that are based on BlueZ 4 from the ones based on BlueZ 5. The bluetooth.c plugin has now been renamed to bluez4.c and the hfp_hf.c plugin is renamed to hfp_hf_bluez4. This will make it easy to add a HFP HF plugin for BlueZ 5. --- Makefile.am | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index c2bd4a4a..63e6fdb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -409,23 +409,23 @@ builtin_sources += plugins/sim900.c if BLUETOOTH if BLUEZ4 -builtin_modules += bluetooth -builtin_sources += plugins/bluetooth.c plugins/bluetooth.h +builtin_modules += bluez4 +builtin_sources += plugins/bluez4.c plugins/bluez4.h builtin_modules += telit -builtin_sources += plugins/telit.c plugins/bluetooth.h +builtin_sources += plugins/telit.c plugins/bluez4.h builtin_modules += sap -builtin_sources += plugins/sap.c plugins/bluetooth.h +builtin_sources += plugins/sap.c plugins/bluez4.h -builtin_modules += hfp -builtin_sources += plugins/hfp_hf.c plugins/bluetooth.h +builtin_modules += hfp_bluez4 +builtin_sources += plugins/hfp_hf_bluez4.c plugins/bluez4.h builtin_modules += hfp_ag -builtin_sources += plugins/hfp_ag.c plugins/bluetooth.h +builtin_sources += plugins/hfp_ag.c plugins/bluez4.h builtin_modules += dun_gw -builtin_sources += plugins/dun_gw.c plugins/bluetooth.h +builtin_sources += plugins/dun_gw.c plugins/bluez4.h builtin_modules += connman builtin_sources += plugins/connman.c @@ -750,7 +750,7 @@ if DUNDEE sbin_PROGRAMS += dundee/dundee dundee_dundee_SOURCES = $(gdbus_sources) $(gatchat_sources) $(btio_sources) \ - src/log.c src/dbus.c plugins/bluetooth.c \ + src/log.c src/dbus.c plugins/bluez4.c \ dundee/dundee.h dundee/main.c dundee/dbus.c \ dundee/manager.c dundee/device.c dundee/bluetooth.c -- cgit v1.2.3