Handle GATT client app's termination

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / CMakeLists.txt

diff --git a/bt-service/CMakeLists.txt b/bt-service/CMakeLists.txt
index d93d9d3..e3e69cf 100644 (file)
--- a/bt-service/CMakeLists.txt
+++ b/bt-service/CMakeLists.txt
@@ -2,7 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(bt-service C)
 
 SET(SRCS
-marshal.c
 bt-service-main.c
 bt-service-event-sender.c
 bt-service-headset-connection.c
@@ -28,6 +27,7 @@ bt-service-agent.c
 bt-service-gap-agent.c
 bt-service-pbap.c
 bt-service-dpm.c
+bt-service-proximity.c
 )
 
 IF(LIBNOTIFY_SUPPORT)
@@ -55,20 +55,18 @@ SET(PKG_MODULES
        aul
        vconf
        syspopup-caller
-       dbus-glib-1
        dbus-1
        gio-2.0
        alarm-service
        capi-content-mime-type
        capi-network-connection
-       pkgmgr
        cynara-client
        cynara-creds-gdbus
        eventsystem
        storage
 )
 
-IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_NETWORK_TETHERING_ENABLE")
+IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_FEATURE_NETWORK_TETHERING_ENABLE")
 SET(PKG_MODULES ${PKG_MODULES}
        capi-network-tethering
 )
@@ -93,10 +91,6 @@ IF("${ARCH}" STREQUAL "arm")
        MESSAGE("add -DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
-FIND_PROGRAM(MARSHALTOOL NAMES glib-genmarshal)
-EXEC_PROGRAM("${MARSHALTOOL}" ARGS "--prefix=marshal ${CMAKE_CURRENT_SOURCE_DIR}/marshal.list --header > ${CMAKE_CURRENT_SOURCE_DIR}/include/marshal.h")
-EXEC_PROGRAM("${MARSHALTOOL}" ARGS "--prefix=marshal ${CMAKE_CURRENT_SOURCE_DIR}/marshal.list --body > ${CMAKE_CURRENT_SOURCE_DIR}/marshal.c")
-
 FIND_PROGRAM(DBUS_BINDING_TOOL NAMES dbus-binding-tool)
 #EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bt ${CMAKE_CURRENT_SOURCE_DIR}/bt-request-service.xml --mode=glib-server --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-service-method.h")
 #EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bt_obex_agent ${CMAKE_CURRENT_SOURCE_DIR}/bt-service-obex-agent.xml --mode=glib-server --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-obex-agent-method.h")
@@ -127,11 +121,11 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/auto-pair-blacklist DESTINATION /opt/v
 # install booting script
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf)
 
-IF (TIZEN_WEARABLE)
+IF (TIZEN_PROFILE_WEARABLE)
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wearable/stack_info DESTINATION /usr/etc/bluetooth/)
 ELSE ()
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mobile/stack_info DESTINATION /usr/etc/bluetooth/)
-ENDIF (TIZEN_WEARABLE)
+ENDIF (TIZEN_PROFILE_WEARABLE)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf DESTINATION /etc/dbus-1/system.d)