remove deprecated APIs in wearable and tv profile. 33/43833/1 accepted/tizen/mobile/20150715.085147 submit/tizen_mobile/20150715.072727 submit/tizen_tv/20150715.072735
authorjiseob.jang <jiseob.jang@samsung.com>
Tue, 14 Jul 2015 10:36:41 +0000 (19:36 +0900)
committerjiseob.jang <jiseob.jang@samsung.com>
Tue, 14 Jul 2015 10:36:41 +0000 (19:36 +0900)
Change-Id: I471f052ab792c93b0f7a31dd335dd922da5e0d6c
Signed-off-by: jiseob.jang <jiseob.jang@samsung.com>
packaging/libaccount-service.spec
src/CMakeLists.txt

index 6de2e9aa81dc7b3f4fc6f910eced5db11bf938dd..d0d074f052f5c037ca56d1b59d56a24abde09d3b 100644 (file)
@@ -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}
 
index 1baf714a4a2497b8dbdeeeb75eea04d23293c2fb..a8d218a3d5e793fe505e8a9a4f58b92f67a3cd4f 100644 (file)
@@ -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)