From b5bd40e1e68b739307e20e19d2164c5b370846df Mon Sep 17 00:00:00 2001 From: José Bollo Date: Thu, 3 Oct 2019 14:33:21 +0200 Subject: Isolate compatibility with old cynara MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The compatibility items of the old cynara librarie are separated and isolated. The option WITH_CYNARA_COMPAT activates it or not. Change-Id: Iba77c97d8df31f5f515b57411487943192451ac6 Signed-off-by: José Bollo --- pkgconfig/CMakeLists.txt | 24 ------------------------ pkgconfig/cynara-compat.pc.in | 5 ----- pkgconfig/link-to-cynara-compat.pc | 1 - 3 files changed, 30 deletions(-) delete mode 100644 pkgconfig/cynara-compat.pc.in delete mode 120000 pkgconfig/link-to-cynara-compat.pc (limited to 'pkgconfig') diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt index 6875ab6..14c05d5 100644 --- a/pkgconfig/CMakeLists.txt +++ b/pkgconfig/CMakeLists.txt @@ -20,27 +20,3 @@ configure_file(cynara.pc.in cynara.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cynara.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - -configure_file(cynara-compat.pc.in cynara-compat.pc @ONLY) - -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cynara-compat.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - -foreach(item cynara-admin.pc - cynara-agent.pc - cynara-client-async.pc - cynara-client.pc - cynara-commons.pc - cynara-creds-commons.pc - cynara-creds-dbus.pc - cynara-creds-gdbus.pc - cynara-creds-self.pc - cynara-creds-socket.pc - cynara-monitor.pc - cynara-plugin.pc - cynara-session.pc) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/link-to-cynara-compat.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - RENAME ${item}) -endforeach(item) - diff --git a/pkgconfig/cynara-compat.pc.in b/pkgconfig/cynara-compat.pc.in deleted file mode 100644 index c698b3a..0000000 --- a/pkgconfig/cynara-compat.pc.in +++ /dev/null @@ -1,5 +0,0 @@ -Name: cynara -Description: cynara package -Version: @CYNARA_VERSION@ -Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lcynara-compat -Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@ -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/cynara diff --git a/pkgconfig/link-to-cynara-compat.pc b/pkgconfig/link-to-cynara-compat.pc deleted file mode 120000 index e8bb0ec..0000000 --- a/pkgconfig/link-to-cynara-compat.pc +++ /dev/null @@ -1 +0,0 @@ -cynara-compat.pc \ No newline at end of file -- cgit 1.2.3-korg