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.

1 files changed, 139 insertions, 164 deletions

diff --git a/src/test/meson.build b/src/test/meson.build
index 234fb77475..17fda96af0 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -39,7 +39,7 @@ test_libudev_sym_c = custom_target(
 
 tests += [
   [['src/test/test-device-nodes.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-engine.c'],
@@ -55,8 +55,8 @@ tests += [
 
   [['src/test/test-job-type.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -66,8 +66,8 @@ tests += [
 
   [['src/test/test-ns.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -78,8 +78,7 @@ tests += [
 
   [['src/test/test-loopback.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared],
    [threads,
     librt,
     libseccomp,
@@ -89,8 +88,8 @@ tests += [
 
   [['src/test/test-hostname.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -105,14 +104,14 @@ tests += [
    []],
 
   [['src/test/test-boot-timestamps.c'],
-   [libshared],
+   [],
    [],
    'ENABLE_EFI'],
 
   [['src/test/test-unit-name.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -122,8 +121,8 @@ tests += [
 
   [['src/test/test-unit-file.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -132,19 +131,19 @@ tests += [
     libblkid]],
 
   [['src/test/test-utf8.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-capability.c'],
-   [libshared],
+   [],
    [libcap]],
 
   [['src/test/test-async.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-locale-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-copy.c'],
@@ -152,215 +151,214 @@ tests += [
    []],
 
   [['src/test/test-sigbus.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-condition.c'],
-   [libsystemd_internal,
-    libshared],
+   [],
    []],
 
   [['src/test/test-fdset.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-fstab-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-ratelimit.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-mount-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-exec-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-hexdecoct.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-alloc-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-xattr-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-io-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-glob-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-fs-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-proc-cmdline.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-fd-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-web-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-cpu-set-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-stat-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-escape.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-string-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-extract-word.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-parse-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-user-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-hostname-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-process-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-terminal-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-path-lookup.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-uid-range.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-cap-list.c',
     generated_gperf_headers],
-   [libshared],
+   [],
    [libcap]],
 
   [['src/test/test-socket-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-barrier.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-tmpfiles.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-namespace.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     libblkid]],
 
   [['src/test/test-verbs.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-install-root.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-acl-util.c'],
-   [libshared],
+   [],
    [],
    'HAVE_ACL'],
 
   [['src/test/test-seccomp.c'],
-   [libshared],
+   [],
    [libseccomp],
    'HAVE_SECCOMP'],
 
   [['src/test/test-rlimit-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-ask-password-api.c'],
-   [libshared],
+   [],
    [],
    '', 'manual'],
 
   [['src/test/test-dissect-image.c'],
-   [libshared],
+   [],
    [libblkid],
    '', 'manual'],
 
   [['src/test/test-signal-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-selinux.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-sizeof.c'],
-   [],
+   [libbasic],
    []],
 
   [['src/test/test-hashmap.c',
     'src/test/test-hashmap-plain.c',
     test_hashmap_ordered_c],
-   [libshared],
+   [],
    [],
    '', 'timeout=90'],
 
   [['src/test/test-set.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-bitmap.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-xml.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-list.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-unaligned.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-tables.c',
@@ -372,45 +370,46 @@ tests += [
     libudev_core,
     libudev_internal,
     libsystemd_network,
-    libsystemd_internal],
+    libshared],
    [threads,
     libseccomp,
     libmount,
     libxz,
-    liblz4],
+    liblz4,
+    libblkid],
    '', '', [], libudev_core_includes],
 
   [['src/test/test-prioq.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-fileio.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-time.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-clock.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-architecture.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-log.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-ipcrm.c'],
-   [libshared],
+   [],
    [],
    '', 'unsafe'],
 
   [['src/test/test-btrfs.c'],
-   [libshared],
+   [],
    [],
    '', 'manual'],
 
@@ -422,49 +421,48 @@ tests += [
    'HAVE_LIBIPTC'],
 
   [['src/test/test-netlink-manual.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    [libkmod],
    'HAVE_KMOD', 'manual'],
 
   [['src/test/test-ellipsize.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-date.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-sleep.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-replace-var.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-calendarspec.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-strip-tab-ansi.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-daemon.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-cgroup.c'],
-   [libshared],
+   [],
    [],
    '', 'manual'],
 
 
   [['src/test/test-cgroup-mask.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -473,29 +471,29 @@ tests += [
     libblkid]],
 
   [['src/test/test-cgroup-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-env-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-strbuf.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-strv.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-path-util.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-path.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -505,8 +503,8 @@ tests += [
 
   [['src/test/test-execute.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -515,27 +513,27 @@ tests += [
     libblkid]],
 
   [['src/test/test-siphash24.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-strxcpyx.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-install.c'],
    [libcore,
-    libsystemd_internal],
+    libshared],
    [],
    '', 'manual'],
 
   [['src/test/test-watchdog.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-sched-prio.c'],
    [libcore,
-    libudev,
-    libsystemd_internal],
+    libshared,
+    libudev],
    [threads,
     librt,
     libseccomp,
@@ -544,25 +542,25 @@ tests += [
     libblkid]],
 
   [['src/test/test-conf-files.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-conf-parser.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-af-list.c',
     generated_gperf_headers],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-arphrd-list.c',
     generated_gperf_headers],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-journal-importer.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-libudev.c'],
@@ -574,7 +572,6 @@ tests += [
    [libudev_core,
     libudev_internal,
     libsystemd_network,
-    libsystemd_internal,
     libshared],
    [librt,
     libblkid,
@@ -583,17 +580,15 @@ tests += [
    '', 'manual'],
 
   [['src/test/test-id128.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/test/test-hash.c'],
-   [libshared],
+   [],
    []],
 
   [['src/test/test-nss.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    [libdl],
    '', 'manual'],
   ]
@@ -623,7 +618,8 @@ tests += [
     libudev],
    [threads,
     libxz,
-    liblz4]],
+    liblz4,
+    libselinux]],
 
   [['src/journal/test-journal-match.c'],
    [libjournal_core,
@@ -713,8 +709,7 @@ tests += [
 
 tests += [
   [['src/libsystemd/sd-bus/test-bus-marshal.c'],
-   [libsystemd_internal,
-    libshared],
+   [],
    [threads,
     libglib,
     libgobject,
@@ -722,18 +717,15 @@ tests += [
     libdbus]],
 
   [['src/libsystemd/sd-bus/test-bus-signature.c'],
-   [libshared_static,
-    libsystemd_internal],
+   [],
    [threads]],
 
   [['src/libsystemd/sd-bus/test-bus-chat.c'],
-   [libshared_static,
-    libsystemd_internal],
+   [],
    [threads]],
 
   [['src/libsystemd/sd-bus/test-bus-cleanup.c'],
-   [libshared_static,
-    libsystemd_internal],
+   [],
    [threads,
     libseccomp]],
 
@@ -747,55 +739,45 @@ tests += [
    [libseccomp]],
 
   [['src/libsystemd/sd-bus/test-bus-server.c'],
-   [libshared_static,
-    libsystemd_internal],
+   [],
    [threads]],
 
   [['src/libsystemd/sd-bus/test-bus-objects.c'],
-   [libshared_static,
-    libsystemd_internal],
+   [],
    [threads]],
 
   [['src/libsystemd/sd-bus/test-bus-gvariant.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    [libglib,
     libgobject,
     libgio]],
 
   [['src/libsystemd/sd-bus/test-bus-creds.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/libsystemd/sd-bus/test-bus-match.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/libsystemd/sd-bus/test-bus-kernel.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/libsystemd/sd-bus/test-bus-kernel-bloom.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/libsystemd/sd-bus/test-bus-benchmark.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    [threads]],
 
   [['src/libsystemd/sd-bus/test-bus-zero-copy.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/libsystemd/sd-bus/test-bus-introspect.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/libsystemd/sd-event/test-event.c'],
@@ -803,23 +785,19 @@ tests += [
    []],
 
   [['src/libsystemd/sd-netlink/test-netlink.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/libsystemd/sd-netlink/test-local-addresses.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    []],
 
   [['src/libsystemd/sd-resolve/test-resolve.c'],
-   [libshared,
-    libsystemd_internal],
+   [],
    [threads]],
 
   [['src/libsystemd/sd-login/test-login.c'],
-   [libshared,
-    libsystemd],
+   [],
    [],
    '', 'manual'],
 ]
@@ -858,16 +836,14 @@ tests += [
   [['src/libsystemd-network/test-ipv4ll-manual.c',
     'src/systemd/sd-ipv4ll.h'],
    [libshared,
-    libsystemd_network,
-    libsystemd_internal],
+    libsystemd_network],
    [],
    '', 'manual'],
 
   [['src/libsystemd-network/test-acd.c',
     'src/systemd/sd-ipv4acd.h'],
    [libshared,
-    libsystemd_network,
-    libsystemd_internal],
+    libsystemd_network],
    [],
    '', 'manual'],
 
@@ -902,18 +878,17 @@ tests += [
 
 tests += [
   [['src/login/test-login-shared.c'],
-   [libshared],
+   [],
    []],
 
   [['src/login/test-inhibit.c'],
-   [libshared],
+   [],
    [],
    '', 'manual'],
 
   [['src/login/test-login-tables.c'],
    [liblogind_core,
-    libsystemd_internal,
-    libudev,
-    libshared],
+    libshared,
+    libudev],
    [threads]],
   ]