Mesh: Add dependency on ELL & JSON-C

Change-Id: Ib0752d10472513972484a27df2620af34a839eac
Signed-off-by: Anupam Roy <anupam.r@samsung.com>

diff --git a/bt-oal/bluez_hal/CMakeLists.txt b/bt-oal/bluez_hal/CMakeLists.txt
index b08dba3..08fad30 100644 (file)
--- a/bt-oal/bluez_hal/CMakeLists.txt
+++ b/bt-oal/bluez_hal/CMakeLists.txt
@@ -56,6 +56,7 @@ SET(PKG_MODULES
        gio-2.0
        syspopup-caller
        dbus-1
+       ell
        dlog
        gobject-2.0
        bundle

diff --git a/bt-oal/bluez_hal/src/bt-hal-event-receiver.h b/bt-oal/bluez_hal/src/bt-hal-event-receiver.h
index 2998fad..1081744 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-event-receiver.h
+++ b/bt-oal/bluez_hal/src/bt-hal-event-receiver.h
@@ -50,6 +50,7 @@ typedef enum {
        HAL_AVRCP_TG,
        HAL_AVRCP_CTRL,
        HAL_GATT,
+       HAL_MESH,
 } bt_hal_module_e;
 
 void _bt_hal_register_event_handler_cb(bt_hal_module_e module, handle_stack_msg cb);

diff --git a/bt-oal/bluez_hal/src/bt-hal-mesh-dbus-handler.h b/bt-oal/bluez_hal/src/bt-hal-mesh-dbus-handler.h
index 7705e60..7e53ac1 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-mesh-dbus-handler.h
+++ b/bt-oal/bluez_hal/src/bt-hal-mesh-dbus-handler.h
@@ -38,7 +38,7 @@ extern "C" {
 
 void _bt_hal_mesh_register_dbus_handler_cb(handle_stack_msg cb);
 
-void _bt_hal_mesh_register_dbus_handler_cb(void);
+void _bt_hal_mesh_unregister_dbus_handler_cb(void);
 
 bool _bt_hal_mesh_stack_init(void);
 

diff --git a/bt-service/CMakeLists.txt b/bt-service/CMakeLists.txt
index c381df8..41f9e80 100644 (file)
--- a/bt-service/CMakeLists.txt
+++ b/bt-service/CMakeLists.txt
@@ -87,6 +87,8 @@ SET(PKG_MODULES
         capi-network-connection
         cynara-client
         cynara-creds-gdbus
+       json-c
+       ell
         eventsystem
         storage
         capi-system-info
@@ -103,6 +105,8 @@ SET(PKG_MODULES
         capi-network-connection
         cynara-client
         cynara-creds-gdbus
+       json-c
+       ell
         eventsystem
         storage
         capi-system-info

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index ced22df..155d8fc 100644 (file)
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -48,6 +48,8 @@ BuildRequires:  cmake
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-creds-gdbus)
 BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(json-c)
+BuildRequires:  pkgconfig(ell)
 BuildRequires:  pkgconfig(storage)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(capi-appfw-app-control)