From 162a3007d9e4bffd358393340c8ae6f5610727a7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Oskar=20=C5=9Awitalski?= <o.switalski@samsung.com>
Date: Mon, 30 May 2016 18:53:30 +0200
Subject: [PATCH] Move logs to common

Change-Id: I45de0d27fa55204ba02ff903e3281ef32960b412
---
 src/agent/CMakeLists.txt           |  1 -
 src/common/CMakeLists.txt          | 18 +++++-------------
 src/{agent => common}/log/alog.cpp |  0
 src/{agent => common}/log/alog.h   |  0
 4 files changed, 5 insertions(+), 14 deletions(-)
 rename src/{agent => common}/log/alog.cpp (100%)
 rename src/{agent => common}/log/alog.h (100%)

diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt
index 489b77a..6d39ceb 100644
--- a/src/agent/CMakeLists.txt
+++ b/src/agent/CMakeLists.txt
@@ -27,7 +27,6 @@ PKG_CHECK_MODULES(AGENT_DEP
 SET(ASKUSER_AGENT_PATH ${ASKUSER_PATH}/agent)
 
 SET(ASKUSER_SOURCES
-    ${ASKUSER_AGENT_PATH}/log/alog.cpp
     ${ASKUSER_AGENT_PATH}/main/Agent.cpp
     ${ASKUSER_AGENT_PATH}/main/CynaraTalker.cpp
     ${ASKUSER_AGENT_PATH}/main/main.cpp
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index eb276ec..45323ba 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2015 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2014-2016 Samsung Electronics Co., Ltd All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,32 +19,24 @@ PKG_CHECK_MODULES(COMMON_DEP
     REQUIRED
     cynara-plugin
     cynara-agent
+    libsystemd-journal
     )
 
 SET(ASKUSER_COMMON_VERSION_MAJOR 0)
 SET(ASKUSER_COMMON_VERSION ${ASKUSER_COMMON_VERSION_MAJOR}.1.0)
 
-SET(COMMON_DEPS
-    libsystemd-journal
-    )
-
-PKG_CHECK_MODULES(ASKUSER_DEP
-    REQUIRED
-    ${COMMON_DEPS}
-    )
-
 INCLUDE_DIRECTORIES(SYSTEM
-    ${ASKUSER_DEP_INCLUDE_DIRS}
+    ${COMMON_DEP_INCLUDE_DIRS}
     )
 
 SET(COMMON_PATH ${ASKUSER_PATH}/common)
 
 INCLUDE_DIRECTORIES(
-    ${COMMON_DEP_INCLUDE_DIRS}
     ${COMMON_PATH}
     )
 
 SET(COMMON_SOURCES
+    ${COMMON_PATH}/log/alog.cpp
     ${COMMON_PATH}/translator/Translator.cpp
     ${COMMON_PATH}/types/AgentErrorMsg.cpp
     ${COMMON_PATH}/util/SafeFunction.cpp
@@ -62,7 +54,7 @@ SET_TARGET_PROPERTIES(
     )
 
 TARGET_LINK_LIBRARIES(${TARGET_ASKUSER_COMMON}
-    ${ASKUSER_DEP_LIBRARIES}
+    ${COMMON_DEP_LIBRARIES}
     )
 
 INSTALL(TARGETS ${TARGET_ASKUSER_COMMON} DESTINATION ${LIB_INSTALL_DIR})
diff --git a/src/agent/log/alog.cpp b/src/common/log/alog.cpp
similarity index 100%
rename from src/agent/log/alog.cpp
rename to src/common/log/alog.cpp
diff --git a/src/agent/log/alog.h b/src/common/log/alog.h
similarity index 100%
rename from src/agent/log/alog.h
rename to src/common/log/alog.h
-- 
2.7.4