Move smack_check from common to server

This function is used only in server. By moving it from common it is now
possible to not link libsecurity-manager-common with libsmack.

Change-Id: If2b8eb8dc252ff21416ab4e075a5471f5647b98a
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 7e9cf2c..2cdca69 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -4,7 +4,6 @@ SET(COMMON_VERSION ${COMMON_VERSION_MAJOR}.1.0)
 PKG_CHECK_MODULES(COMMON_DEP
     REQUIRED
     dlog
-    libsmack
     )
 
 INCLUDE_DIRECTORIES(SYSTEM
@@ -20,7 +19,6 @@ INCLUDE_DIRECTORIES(
 SET(COMMON_SOURCES
     ${COMMON_PATH}/protocols.cpp
     ${COMMON_PATH}/message-buffer.cpp
-    ${COMMON_PATH}/smack-check.cpp
     ${DPL_PATH}/log/src/abstract_log_provider.cpp
     ${DPL_PATH}/log/src/dlog_log_provider.cpp
     ${DPL_PATH}/log/src/log.cpp

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 11b38b2..cb6ffd2 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES(SYSTEM
 INCLUDE_DIRECTORIES(
     ${INCLUDE_PATH}
     ${COMMON_PATH}/include
+    ${SERVER_PATH}/include
     ${SERVER_PATH}/main/include
     ${SERVER_PATH}/service/include
     ${DPL_PATH}/core/include
@@ -29,6 +30,7 @@ INCLUDE_DIRECTORIES(
     )
 
 SET(SERVER_SOURCES
+    ${SERVER_PATH}/smack-check.cpp
     ${SERVER_PATH}/main/security-manager-util.cpp
     ${SERVER_PATH}/main/generic-socket-manager.cpp
     ${SERVER_PATH}/main/socket-manager.cpp

diff --git a/src/common/include/smack-check.h b/src/server/include/smack-check.h
similarity index 100%
rename from src/common/include/smack-check.h
rename to src/server/include/smack-check.h

diff --git a/src/common/smack-check.cpp b/src/server/smack-check.cpp
similarity index 100%
rename from src/common/smack-check.cpp
rename to src/server/smack-check.cpp