summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-14 18:49:47 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-23 21:47:28 -0400
commitaac2605820859fe2908ba9adfcb96a65b2e375e5 (patch)
treee89fd0988b8e587108457e9c370d7017e2518f2b /src/shared
parentab916f2e8101a4733f66b8d291895af73965b379 (diff)
meson: eliminate libsystemd_journal_internal and use libsystemd_internal less
This simplifies things and leads to a smaller installation footprint. libsystemd_internal and libsystemd_journal_internal are linked into libystemd-shared and available to all programs linked to libsystemd-shared. libsystemd_journal_internal is not needed anymore, and libsystemd-shared is used everwhere. The few exceptions are: libsystemd.so, test-engine, test-bus-error, and various loadable modules.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/meson.build9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 3608575be4..4a51241d44 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -122,13 +122,12 @@ libshared = shared_library(
libshared_name,
shared_sources,
basic_sources,
+ journal_internal_sources,
+ libsystemd_internal_sources,
include_directories : includes,
link_args : ['-shared'],
c_args : ['-fvisibility=default'],
- link_with : [libsystemd_journal_internal,
- libsystemd_internal,
- libudev,
- ],
+ link_with : [libudev],
dependencies : [threads,
librt,
libcap,
@@ -140,7 +139,7 @@ libshared = shared_library(
libidn,
libxz,
liblz4,
- ],
+ libblkid],
install : true,
install_dir : rootlibexecdir)