From 2d25a3f5b560e6709bd5d69dbbf4c8c2b4a31f3d Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Tue, 24 Jun 2014 13:21:37 +0200 Subject: [PATCH] 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 --- src/common/CMakeLists.txt | 2 -- src/server/CMakeLists.txt | 2 ++ src/{common => server}/include/smack-check.h | 0 src/{common => server}/smack-check.cpp | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename src/{common => server}/include/smack-check.h (100%) rename src/{common => server}/smack-check.cpp (100%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 7e9cf2c..2cdca69 100644 --- 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 --- 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 -- 2.7.4