Remove unneeded dependencies from nss plugin

Dlog dependency was replaced by systemd journal on HQ request.

Change-Id: Ibb8ab3ba11ef9295721cfedfcbc0336dadf5d2bb

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1f7034c5c72ab0c9def4c1f1b9f374a17218dfc..471ba247bbab8661ced295024f8908b25849d09a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,7 @@ SET(LOG_TARGET_LIST ${TARGET_SERVER}
 
 # NSS target doesn't get ANY logs by design in release mode
 IF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-    LIST(APPEND ${LOG_TARGET_LIST} ${TARGET_NSS})
+    LIST(APPEND LOG_TARGET_LIST ${TARGET_NSS})
 ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
 FOREACH(TARGET_NAME ${LOG_TARGET_LIST})

diff --git a/src/nss/CMakeLists.txt b/src/nss/CMakeLists.txt
index 9e22671da0ea784025447ee2eaeabd34889298b9..5ff425b31a1d7004ba8fbf51763149068abb285e 100644 (file)
--- a/src/nss/CMakeLists.txt
+++ b/src/nss/CMakeLists.txt
@@ -3,46 +3,47 @@ SET(NSS_PLUGIN_VERSION ${NSS_PLUGIN_VERSION_MAJOR}.0.0)
 
 SET(LIBRARY_FILE_NAME "nss_securitymanager")
 
-IF(CMAKE_BUILD_TYPE MATCHES "DEBUG" AND DPL_WITH_DLOG)
-    PKG_CHECK_MODULES(NSS_DLOG_DEP REQUIRED dlog libtzplatform-config)
-ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG" AND DPL_WITH_DLOG)
+IF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+    IF(DPL_WITH_DLOG)
+        PKG_CHECK_MODULES(NSS_DEP REQUIRED dlog)
+    ENDIF(DPL_WITH_DLOG)
+    IF(DPL_WITH_SYSTEMD_JOURNAL)
+        PKG_CHECK_MODULES(NSS_DEP REQUIRED libsystemd)
+    ENDIF(DPL_WITH_SYSTEMD_JOURNAL)
+ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
 INCLUDE_DIRECTORIES(
     ${INCLUDE_PATH}
-    ${CLIENT_PATH}/include
-    ${NSS_PATH}/include
     ${DPL_PATH}/core/include
     ${DPL_PATH}/log/include
     ${COMMON_PATH}/include
-    ${NSS_DLOG_DEP_INCLUDE_DIRS}
+    ${NSS_DEP_INCLUDE_DIRS}
     )
 
 SET(NSS_SOURCES
     ${NSS_PATH}/nss_securitymanager.cpp
-    ${DPL_PATH}/log/src/abstract_log_provider.cpp
     ${DPL_PATH}/log/src/log.cpp
-    ${DPL_PATH}/log/src/old_style_log_provider.cpp
-    ${DPL_PATH}/core/src/assert.cpp
-    ${DPL_PATH}/core/src/binary_queue.cpp
-    ${DPL_PATH}/core/src/colors.cpp
     ${DPL_PATH}/core/src/exception.cpp
     ${DPL_PATH}/core/src/noncopyable.cpp
-    ${DPL_PATH}/core/src/serialization.cpp
     ${DPL_PATH}/core/src/errno_string.cpp
-    ${COMMON_PATH}/channel.cpp
     ${COMMON_PATH}/config-file.cpp
-    ${COMMON_PATH}/connection.cpp
-    ${COMMON_PATH}/filesystem.cpp
-    ${COMMON_PATH}/protocols.cpp
-    ${COMMON_PATH}/message-buffer.cpp
     ${COMMON_PATH}/utils.cpp
     )
 
-IF(CMAKE_BUILD_TYPE MATCHES "DEBUG" AND DPL_WITH_DLOG)
+IF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
     SET(NSS_SOURCES
         ${NSS_SOURCES}
-        ${DPL_PATH}/log/src/dlog_log_provider.cpp)
-ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG" AND DPL_WITH_DLOG)
+        ${DPL_PATH}/log/src/abstract_log_provider.cpp
+        ${DPL_PATH}/log/src/old_style_log_provider.cpp
+        ${DPL_PATH}/core/src/colors.cpp
+    )
+    IF(DPL_WITH_DLOG)
+        SET(NSS_SOURCES ${NSS_SOURCES} ${DPL_PATH}/log/src/dlog_log_provider.cpp)
+    ENDIF(DPL_WITH_DLOG)
+    IF(DPL_WITH_SYSTEMD_JOURNAL)
+        SET(NSS_SOURCES ${NSS_SOURCES} ${DPL_PATH}/log/src/sd_journal_provider.cpp)
+    ENDIF(DPL_WITH_SYSTEMD_JOURNAL)
+ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
 ADD_LIBRARY(${TARGET_NSS} SHARED ${NSS_SOURCES})
 
@@ -54,6 +55,6 @@ SET_TARGET_PROPERTIES(${TARGET_NSS}
         VERSION ${NSS_PLUGIN_VERSION}
     )
 
-TARGET_LINK_LIBRARIES(${TARGET_NSS} ${NSS_DLOG_DEP_LIBRARIES} "-z defs")
+TARGET_LINK_LIBRARIES(${TARGET_NSS} ${NSS_DEP_LIBRARIES} "-z defs")
 
 INSTALL(TARGETS ${TARGET_NSS} LIBRARY DESTINATION ${LIB_INSTALL_DIR} NAMELINK_SKIP)

diff --git a/src/nss/nss_securitymanager.cpp b/src/nss/nss_securitymanager.cpp
index 333e9e06b37b1677cb34fc6169604997d95d4e28..06d03ee498bb443418f52e3d93ce1f2fefa1c6e0 100644 (file)
--- a/src/nss/nss_securitymanager.cpp
+++ b/src/nss/nss_securitymanager.cpp
@@ -34,7 +34,6 @@
 #include <vector>
 #include <algorithm>
 
-#include <config-file.h>
 #include <dpl/log/log.h>
 #include <dpl/singleton.h>
 #include <security-manager-types.h>