Bluetotoh-Service/Map: Don't compile MAP for IVI

Change-Id: I88136127e79e62645f8d658730a7c78563f17142
Signed-off-by: Wu Jiangbo <jiangbox.wu@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7bdaed..49f84b9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,6 @@ pkg_check_modules(${TEST} REQUIRED
                        glib-2.0
                        dbus-1
                        gio-2.0
-                       msg-service
-                       email-service
-                       vconf
                        gio-unix-2.0)
 
 FOREACH(flag ${${TEST}_CFLAGS})
@@ -25,6 +22,23 @@ SET(LIB_INSTALL_DIR "/usr/lib/")
 SET(TEST_INSTALL_DIR "${LIB_INSTALL_DIR}bluetooth-frwk-test/")
 SET(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}bluetooth-service/plugins/")
 
+IF(platform STREQUAL "Mobile")
+SET(MOBILE_FLAGS "mobile-flags")
+pkg_check_modules(${MOBILE_FLAGS} REQUIRED
+                       msg-service
+                       email-service
+                       vconf)
+FOREACH(flag ${${MOBILE_FLAGS}_CFLAGS})
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
+FOREACH(flag ${${MOBILE_FLAGS}_LDFLAGS})
+       SET(${TEST}_LDFLAGS "${${TEST}_LDFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+ADD_DEFINITIONS(-DMOBILE)
+ENDIF()
+
 IF(platform STREQUAL "GEEK" OR platform STREQUAL "IVI")
 SET(TIZEN_FLAGS "tizen-flags")
 pkg_check_modules(${TIZEN_FLAGS} REQUIRED
@@ -48,6 +62,7 @@ ENDIF()
 # BLUETOOTH-SERVICE
 SET(BLUETOOTH-SERVICE "bluetooth-service")
 
+IF(platform STREQUAL "Mobile")
 SET(SOURCES_BLUETOOTH_SERVICE
        src/main.c
        src/manager.c
@@ -63,6 +78,20 @@ SET(SOURCES_BLUETOOTH_SERVICE
        lib/common.c
        lib/obex.c
    )
+ELSE()
+SET(SOURCES_BLUETOOTH_SERVICE
+       src/main.c
+       src/manager.c
+       src/plugin.c
+       src/vertical.c
+       src/pairing.c
+       src/opp.c
+       src/media.c
+       lib/bluez.c
+       lib/common.c
+       lib/obex.c
+   )
+ENDIF()
 
 ADD_EXECUTABLE(${BLUETOOTH-SERVICE} ${SOURCES_BLUETOOTH_SERVICE})
 TARGET_LINK_LIBRARIES(${BLUETOOTH-SERVICE} ${${TEST}_LDFLAGS} -ldl)

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index b268553..9908b59 100644 (file)
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -16,9 +16,6 @@ BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(syspopup-caller)
 BuildRequires:  pkgconfig(notification)
-BuildRequires:  pkgconfig(msg-service)
-BuildRequires:  pkgconfig(email-service)
-BuildRequires:  pkgconfig(vconf)
 
 BuildRequires:  cmake
 

diff --git a/src/manager.c b/src/manager.c
index 0e80aef..500fb31 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -23,7 +23,9 @@
 
 #include "pairing.h"
 #include "opp.h"
+#ifdef MOBILE
 #include "map_agent.h"
+#endif
 #include "media.h"
 #include "bluez.h"
 #include "gdbus.h"
@@ -260,7 +262,9 @@ static void adapter_powered_on(CommsManagerSkeleton *skeleton)
        bt_service_opp_init(bt_object, connection);
        bt_service_media_init(bt_object, connection, default_adapter);
 
+#ifdef MOBILE
        bt_map_agent_init();
+#endif
 
        g_dbus_object_manager_server_export(manager_server, bt_object);
 }
@@ -283,7 +287,9 @@ static void adapter_powered_off(CommsManagerSkeleton *skeleton)
        bt_service_opp_deinit();
        bt_service_media_deinit();
 
+#ifdef MOBILE
        bt_map_agent_deinit();
+#endif
 
        g_dbus_object_manager_server_unexport(manager_server,
                                                BLUETOOTH_PATH);