summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-12-19 19:14:03 +0100
committerSven Eden <yamakuzure@gmx.net>2018-05-30 07:49:47 +0200
commitcba4e27941fef3c0b170792f6ec0cba019d36734 (patch)
treef3249502dcdcc8a5391d399ba4008b3b4d39fa6c /src
parentcfdad284c65f39594bdba8bae4260ac2d21ade82 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/libelogind/meson.build3
-rw-r--r--src/shared/meson.build8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build
index 583f4d73f..e4fd6d864 100644
--- 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 1bc098bf8..89f11a51c 100644
--- 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,