[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ksecrets] src/runtime: Moving to the backend
From:       Valentin Rusu <kde () rusu ! info>
Date:       2015-08-12 11:26:24
Message-ID: E1ZPUAq-0007H7-RX () scm ! kde ! org
[Download RAW message or body]

Git commit b391494c5d82003ec7bf6a006bb70840995b709c by Valentin Rusu.
Committed on 11/08/2015 at 13:43.
Pushed by vrusu into branch 'master'.

Moving to the backend

M  +4    -5    src/runtime/ksecrets-crypt/CMakeLists.txt
M  +1    -0    src/runtime/ksecrets_backend/CMakeLists.txt
R  +1    -1    src/runtime/ksecrets_backend/ksecrets_crypt.c [from: src/run=
time/ksecrets-crypt/ksecrets-crypt.c - 099% similarity]
R  +0    -0    src/runtime/ksecrets_backend/ksecrets_crypt.h [from: src/run=
time/ksecrets-crypt/ksecrets-crypt.h - 100% similarity]
M  +3    -2    src/runtime/pam-ksecrets/CMakeLists.txt

http://commits.kde.org/ksecrets/b391494c5d82003ec7bf6a006bb70840995b709c

diff --git a/src/runtime/ksecrets-crypt/CMakeLists.txt b/src/runtime/ksecre=
ts-crypt/CMakeLists.txt
index 2268625..56db5d6 100644
--- a/src/runtime/ksecrets-crypt/CMakeLists.txt
+++ b/src/runtime/ksecrets-crypt/CMakeLists.txt
@@ -14,11 +14,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../ksec=
rets_backend)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../ksecrets_backend)
 =

 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
-set(ksecrets_crypt_SRC
-  ksecrets-crypt.c
+set(ksecrets_config_SRC
   config.cpp)
 =

-add_library(ksecrets_crypt STATIC ${ksecrets_crypt_SRC})
-target_link_libraries(ksecrets_crypt PRIVATE KF5::ConfigCore)
-set_target_properties(ksecrets_crypt PROPERTIES PREFIX "")
+add_library(ksecrets_config STATIC ${ksecrets_config_SRC})
+target_link_libraries(ksecrets_config PRIVATE KF5::ConfigCore)
+set_target_properties(ksecrets_config PROPERTIES PREFIX "")
 =

diff --git a/src/runtime/ksecrets_backend/CMakeLists.txt b/src/runtime/ksec=
rets_backend/CMakeLists.txt
index a852068..92a3244 100644
--- a/src/runtime/ksecrets_backend/CMakeLists.txt
+++ b/src/runtime/ksecrets_backend/CMakeLists.txt
@@ -9,6 +9,7 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSECRETS_B=
ACKEND
                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5Sec=
retsBackendConfigVersion.cmake")
 =

 set(ksecrets_backend_SRC
+   ksecrets_crypt.c
    ksecrets_backend.cpp)
 =

 add_library(ksecrets_backend SHARED ${ksecrets_backend_SRC})
diff --git a/src/runtime/ksecrets-crypt/ksecrets-crypt.c b/src/runtime/ksec=
rets_backend/ksecrets_crypt.c
similarity index 99%
rename from src/runtime/ksecrets-crypt/ksecrets-crypt.c
rename to src/runtime/ksecrets_backend/ksecrets_crypt.c
index b0af79c..959765f 100644
--- a/src/runtime/ksecrets-crypt/ksecrets-crypt.c
+++ b/src/runtime/ksecrets_backend/ksecrets_crypt.c
@@ -17,7 +17,7 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include "ksecrets-crypt.h"
+#include "ksecrets_crypt.h"
 =

 #include <unistd.h>
 #include <errno.h>
diff --git a/src/runtime/ksecrets-crypt/ksecrets-crypt.h b/src/runtime/ksec=
rets_backend/ksecrets_crypt.h
similarity index 100%
rename from src/runtime/ksecrets-crypt/ksecrets-crypt.h
rename to src/runtime/ksecrets_backend/ksecrets_crypt.h
diff --git a/src/runtime/pam-ksecrets/CMakeLists.txt b/src/runtime/pam-ksec=
rets/CMakeLists.txt
index 7c0b71c..9804532 100644
--- a/src/runtime/pam-ksecrets/CMakeLists.txt
+++ b/src/runtime/pam-ksecrets/CMakeLists.txt
@@ -11,7 +11,8 @@ INCLUDE_DIRECTORIES(
   ${PAM_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../ksecrets-crypt
+  ${CMAKE_CURRENT_SOURCE_DIR}/../ksecrets_backend
+  ${CMAKE_CURRENT_BINARY_DIR}/../ksecrets_backend
 )
 =

 set(pam_ksecret_SRC
@@ -20,7 +21,7 @@ set(pam_ksecret_SRC
 add_library(pam_ksecrets STATIC ${pam_ksecret_SRC})
 set_target_properties(pam_ksecrets PROPERTIES PREFIX "")
 target_link_libraries(pam_ksecrets
-  ksecrets_crypt
+  ksecrets_backend
   ${LIBGCRYPT_LIBRARIES}
   ${PAM_LIBRARIES}
   keyutils)

[prev in list] [next in list] [prev in thread] [next in thread]