Improve library split parts

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>

5 files changed, 88 insertions, 32 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4aa6853..8ef4b8a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,8 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-set(SERVER_SOURCES
-	agent-at.c
+set(LIBCORE_SOURCES
 	anydb.c
 	cyn.c
 	db.c
@@ -25,17 +24,21 @@ set(SERVER_SOURCES
 	expire.c
 	fbuf.c
 	filedb.c
-	main-cynarad.c
 	memdb.c
 	pollitem.c
-	prot.c
 	queue.c
+)
+
+set(SERVER_SOURCES
+	agent-at.c
+	main-cynarad.c
+	prot.c
 	rcyn-protocol.c
 	rcyn-server.c
 	socket.c
 )
 
-set(LIB_SOURCES
+set(LIBCLI_SOURCES
 	cache.c
 	lib-compat.c
 	prot.c
@@ -44,25 +47,70 @@ set(LIB_SOURCES
 	socket.c
 )
 
+set(LIBCLI_SOURCES
+	cache.c
+	prot.c
+	rcyn-client.c
+	rcyn-protocol.c
+	socket.c
+)
+
+set(LIBCOMPAT_SOURCES
+	lib-compat.c
+)
+
 add_compile_definitions(_GNU_SOURCE)
 
 ###########################################
-# build and install libcynara
+# build and install libcynara-core
 ###########################################
-ADD_LIBRARY(cynara SHARED ${LIB_SOURCES})
-target_compile_definitions(cynara PRIVATE
+add_library(cynara-core SHARED ${LIBCORE_SOURCES})
+set_target_properties(cynara-core PROPERTIES
+	VERSION ${CYNARA_VERSION}
+	SOVERSION ${CYNARA_SOVERSION})
+target_link_libraries(cynara-core
+	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-cynara-core.map
+	-Wl,--as-needed
+	-Wl,--gc-sections
+)
+install(TARGETS cynara-core LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+
+###########################################
+# build and install libcynara-client
+###########################################
+add_library(cynara-client SHARED ${LIBCLI_SOURCES})
+target_compile_definitions(cynara-client PRIVATE
 	RCYN_DEFAULT_SOCKET_DIR="${DEFAULT_SOCKET_DIR}"
 )
-SET_TARGET_PROPERTIES(cynara PROPERTIES
+set_target_properties(cynara-client PROPERTIES
+	VERSION ${CYNARA_VERSION}
+	SOVERSION ${CYNARA_SOVERSION})
+target_link_options(cynara-client
+	PRIVATE
+	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-cynara-client.map
+	-Wl,--as-needed
+	-Wl,--gc-sections
+)
+install(TARGETS cynara-client LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+install(FILES rcyn-client.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/cynara)
+
+###########################################
+# build and install libcynara-compat
+###########################################
+add_library(cynara-compat SHARED ${LIBCOMPAT_SOURCES})
+set_target_properties(cynara-compat PROPERTIES
 	VERSION ${CYNARA_VERSION}
 	SOVERSION ${CYNARA_SOVERSION})
-TARGET_LINK_LIBRARIES(cynara
-	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map
+target_link_libraries(cynara-compat
+	PRIVATE cynara-client
+)
+target_link_options(cynara-compat
+	PRIVATE
+	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-cynara-compat.map
 	-Wl,--as-needed
 	-Wl,--gc-sections
 )
-INSTALL(TARGETS cynara LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
-INSTALL(FILES rcyn-client.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/cynara)
+install(TARGETS cynara-compat LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
 
 ###########################################
 # build and install cynarad
@@ -74,34 +122,29 @@ target_compile_definitions(cynarad PRIVATE
 	DEFAULT_INIT_FILE="${DEFAULT_INIT_FILE}"
 	RCYN_DEFAULT_SOCKET_DIR="${DEFAULT_SOCKET_DIR}"
 )
-target_link_libraries(cynarad cap)
+if(SYSTEMD)
+	target_compile_definitions(cynarad PRIVATE WITH_SYSTEMD_ACTIVATION)
+	target_link_libraries(cynarad ${libsystemd_LDFLAGS} ${libsystemd_LINK_LIBRARIES})
+	target_include_directories(cynarad PRIVATE ${libsystemd_INCLUDE_DIRS})
+	target_compile_options(cynarad PRIVATE ${libsystemd_CFLAGS})
+endif()
+target_link_libraries(cynarad cynara-core cap)
 install(TARGETS cynarad
         RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
 
 ###########################################
 # build and install cynadm
 ###########################################
-ADD_EXECUTABLE(cynadm main-cynadm.c expire.c)
-TARGET_LINK_LIBRARIES(cynadm cynara)
-INSTALL(TARGETS cynadm
+add_executable(cynadm main-cynadm.c expire.c)
+target_link_libraries(cynadm cynara-client)
+install(TARGETS cynadm
         RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
 
 ###########################################
 # build and install test-old-cynara
 ###########################################
-ADD_EXECUTABLE(test-old-cynara main-test-old-cynara.c)
-TARGET_LINK_LIBRARIES(test-old-cynara cynara)
-INSTALL(TARGETS test-old-cynara
+add_executable(test-old-cynara main-test-old-cynara.c)
+target_link_libraries(test-old-cynara cynara-compat)
+install(TARGETS test-old-cynara
         RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
 
-###########################################
-# alterations for SYSTEMD and socket specs
-###########################################
-
-if(SYSTEMD)
-   target_compile_definitions(cynarad PRIVATE WITH_SYSTEMD_ACTIVATION)
-   target_link_libraries(cynarad ${libsystemd_LDFLAGS} ${libsystemd_LINK_LIBRARIES})
-   target_include_directories(cynarad PRIVATE ${libsystemd_INCLUDE_DIRS})
-   target_compile_options(cynarad PRIVATE ${libsystemd_CFLAGS})
-endif()
-
diff --git a/src/SOURCES.md b/src/SOURCES.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/SOURCES.md
diff --git a/src/export-cynara-client.map b/src/export-cynara-client.map
new file mode 100644
index 0000000..326de85
--- /dev/null
+++ b/src/export-cynara-client.map
@@ -0,0 +1,8 @@
+{
+global:
+	rcyn_*;
+local:
+	*;
+};
+
+
diff --git a/src/export.map b/src/export-cynara-compat.map
index 84467af..7b482f3 100644
--- a/src/export.map
+++ b/src/export-cynara-compat.map
@@ -1,6 +1,5 @@
 {
 global:
-	rcyn_*;
 	cynara_*;
 local:
 	*;
diff --git a/src/export-cynara-core.map b/src/export-cynara-core.map
new file mode 100644
index 0000000..8193f44
--- /dev/null
+++ b/src/export-cynara-core.map
@@ -0,0 +1,6 @@
+{
+global:
+	*;
+};
+
+