From 5c43c64930435efc2ff185d9d2c0d9b3159ea568 Mon Sep 17 00:00:00 2001 From: "jiseob.jang" Date: Tue, 14 Jul 2015 19:36:41 +0900 Subject: [PATCH] remove deprecated APIs in wearable and tv profile. Change-Id: I471f052ab792c93b0f7a31dd335dd922da5e0d6c Signed-off-by: jiseob.jang --- packaging/libaccount-service.spec | 10 +++++----- src/CMakeLists.txt | 12 +++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/packaging/libaccount-service.spec b/packaging/libaccount-service.spec index 6de2e9a..d0d074f 100644 --- a/packaging/libaccount-service.spec +++ b/packaging/libaccount-service.spec @@ -50,11 +50,11 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIBDIR=%{_libdir} \ -DBINDIR=%{_bindir} \ -DINCLUDEDIR=%{_includedir} \ -#%if "%{?tizen_profile_name}" == "mobile" -# -DFEATURE_PROFILE_MOBILE:BOOL=ON -#%else -# -DFEATURE_PROFILE_MOBILE:BOOL=OFF -#%endif +%if "%{?profile}" == "mobile" + -DFEATURE_PROFILE_MOBILE:BOOL=ON +%else + -DFEATURE_PROFILE_MOBILE:BOOL=OFF +%endif make %{?jobs:-j%jobs} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1baf714..a8d218a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,8 +40,6 @@ ADD_DEFINITIONS("-DSLP_DEBUG") IF(FEATURE_PROFILE_MOBILE) ADD_DEFINITIONS("-DTIZEN_PROFILE_MOBILE") -ELSE(FEATURE_PROFILE_MOBILE) - ADD_DEFINITIONS("-DTIZEN_PROFILE_MOBILE") ENDIF(FEATURE_PROFILE_MOBILE) ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) @@ -60,11 +58,11 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}/accounts-svc) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}) INSTALL(FILES ${CMAKE_BINARY_DIR}/src/${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig) -#IF(FEATURE_PROFILE_MOBILE) -#INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/mobile/account.h DESTINATION include) -#ELSE(FEATURE_PROFILE_MOBILE) -#INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wearable/account.h DESTINATION include) -#ENDIF(FEATURE_PROFILE_MOBILE) +IF(FEATURE_PROFILE_MOBILE) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/mobile/account.h DESTINATION include) +ELSE(FEATURE_PROFILE_MOBILE) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wearable/account.h DESTINATION include) +ENDIF(FEATURE_PROFILE_MOBILE) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/account.h DESTINATION include) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/account-error.h DESTINATION include) -- 2.7.4