From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 19 Dec 2017 18:38:43 +0000 (+0100)
Subject: meson: use a convenience lib for journal user sources
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d86cd5bf77ef02fd5825ecccb64dc64ea6e5d4e3;p=elogind.git

meson: use a convenience lib for journal user sources

Instead of compiling those files twice, once for libsystemd and once for
libshared, compile once as a static archive and then link into both.
This reduce the meson target for man=no compile to 1291.
---

diff --git a/meson.build b/meson.build
index 6883d4a7a..bbd4ed340 100644
--- a/meson.build
+++ b/meson.build
@@ -1437,14 +1437,14 @@ subdir('src/login')
 # libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym)
 # libsystemd = shared_library(
 #         'systemd',
-#         journal_internal_sources,
 #         version : libsystemd_version,
 #         include_directories : includes,
 #         link_args : ['-shared',
 #                      '-Wl,--version-script=' + libsystemd_sym_path],
 #         link_with : [libbasic,
 #                      libbasic_gcrypt],
-#         link_whole : libsystemd_static,
+#         link_whole : [libsystemd_static,
+#                       libjournal_client],
 #         dependencies : [threads,
 #                         librt,
 #                         libxz,
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 89f11a51c..de1a98f12 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -201,7 +201,6 @@ libshared_static = static_library(
 libshared = shared_library(
         libshared_name,
 #if 0 /// UNNEEDED by elogind
-#         journal_internal_sources,
 #         libudev_sources,
 #         include_directories : includes,
 #         link_args : ['-shared',
@@ -209,7 +208,8 @@ libshared = shared_library(
 #         link_whole : [libshared_static,
 #                       libbasic,
 #                       libbasic_gcrypt,
-#                       libsystemd_static],
+#                       libsystemd_static,
+#                       libjournal_client],
 #else
         libelogind_internal_sources,
 #endif // 0