From d4a2c432763b033acf7c94ee7e121aca5a3a4f10 Mon Sep 17 00:00:00 2001
From: José Bollo <jose.bollo@iot.bzh>
Date: Thu, 3 Oct 2019 12:34:13 +0200
Subject: Improve library split parts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In prevision of further developments (like plugins)
the server is splitted in two parts: the server program
itself and the core library.

The client library is also splitted in two parts:
the compatibility part and the real client part.

Change-Id: Iaee93298d52eb825ad9aed5d2b3e74c2975b5950
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 pkgconfig/CMakeLists.txt           | 7 ++++++-
 pkgconfig/cynara-compat.pc.in      | 5 +++++
 pkgconfig/cynara.pc.in             | 2 +-
 pkgconfig/link-to-cynara-compat.pc | 1 +
 pkgconfig/link.pc                  | 1 -
 5 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pkgconfig/cynara-compat.pc.in
 create mode 120000 pkgconfig/link-to-cynara-compat.pc
 delete mode 120000 pkgconfig/link.pc

(limited to 'pkgconfig')

diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt
index f32ad70..6875ab6 100644
--- a/pkgconfig/CMakeLists.txt
+++ b/pkgconfig/CMakeLists.txt
@@ -21,6 +21,11 @@ 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 
@@ -34,7 +39,7 @@ foreach(item cynara-admin.pc
              cynara-monitor.pc
              cynara-plugin.pc
              cynara-session.pc) 
-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/link.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
new file mode 100644
index 0000000..c698b3a
--- /dev/null
+++ b/pkgconfig/cynara-compat.pc.in
@@ -0,0 +1,5 @@
+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/cynara.pc.in b/pkgconfig/cynara.pc.in
index 6a39979..a92cbf4 100644
--- a/pkgconfig/cynara.pc.in
+++ b/pkgconfig/cynara.pc.in
@@ -1,5 +1,5 @@
 Name: cynara
 Description: cynara package
 Version: @CYNARA_VERSION@
-Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lcynara
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lcynara-client
 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
new file mode 120000
index 0000000..e8bb0ec
--- /dev/null
+++ b/pkgconfig/link-to-cynara-compat.pc
@@ -0,0 +1 @@
+cynara-compat.pc
\ No newline at end of file
diff --git a/pkgconfig/link.pc b/pkgconfig/link.pc
deleted file mode 120000
index 17d4d5d..0000000
--- a/pkgconfig/link.pc
+++ /dev/null
@@ -1 +0,0 @@
-cynara.pc
\ No newline at end of file
-- 
cgit 1.2.3-korg