meson: link libsystemd_static in libshared instead of recompiling

This is similar to the great-grandpa commit. This time the number
of meson targets compilation without man is reduced from 1347 to 1302.

diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build
index 583f4d73fa774cf483daa1922dddb0fa2ef65daf..e4fd6d864ac92f825910c64178c51c9270a56153 100644 (file)
--- a/src/libelogind/meson.build
+++ b/src/libelogind/meson.build
@@ -150,7 +150,8 @@ libelogind_static = static_library(
         link_with : libbasic,
 #if 0 /// elogind does not need librt
 #         dependencies : [threads,
-#                         librt])
+#                         librt],
+#         c_args : ['-fvisibility=default'])
 #else
         dependencies : [threads])
 #endif // 0

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 1bc098bf86578445191d09446da560f8b63bb3a4..89f11a51cbd76cd1038ba65e2a8853c63c1431fa 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -202,17 +202,17 @@ libshared = shared_library(
         libshared_name,
 #if 0 /// UNNEEDED by elogind
 #         journal_internal_sources,
-#         libsystemd_sources,
 #         libudev_sources,
+#         include_directories : includes,
+#         link_args : ['-shared',
 #                      '-Wl,--version-script=' + libshared_sym_path],
 #         link_whole : [libshared_static,
 #                       libbasic,
-#                       libbasic_gcrypt],
+#                       libbasic_gcrypt,
+#                       libsystemd_static],
 #else
         libelogind_internal_sources,
 #endif // 0
-        include_directories : includes,
-        link_args : ['-shared',
         c_args : ['-fvisibility=default'],
         dependencies : libshared_deps,
         install : true,