summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd/meson.build88
-rw-r--r--src/libudev/meson.build3
-rw-r--r--src/machine/meson.build6
-rw-r--r--src/network/meson.build5
-rw-r--r--src/resolve/meson.build3
-rw-r--r--src/shared/meson.build2
-rw-r--r--src/test/meson.build232
-rw-r--r--src/udev/meson.build18
8 files changed, 212 insertions, 145 deletions
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 999347da46..15e7d77693 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -96,91 +96,3 @@ libsystemd_pc = configure_file(
configuration : substs)
install_data(libsystemd_pc,
install_dir : pkgconfiglibdir)
-
-tests += [
- [['src/libsystemd/sd-bus/test-bus-marshal.c'],
- [],
- [libglib,
- libgobject,
- libgio,
- libdbus]],
-
- [['src/libsystemd/sd-bus/test-bus-signature.c'],
- [],
- []],
-
- [['src/libsystemd/sd-bus/test-bus-chat.c'],
- [],
- [threads]],
-
- [['src/libsystemd/sd-bus/test-bus-cleanup.c'],
- [],
- [libseccomp]],
-
- [['src/libsystemd/sd-bus/test-bus-track.c'],
- [],
- [libseccomp]],
-
- [['src/libsystemd/sd-bus/test-bus-server.c'],
- [],
- [threads]],
-
- [['src/libsystemd/sd-bus/test-bus-objects.c'],
- [],
- [threads]],
-
- [['src/libsystemd/sd-bus/test-bus-gvariant.c'],
- [],
- [libglib,
- libgobject,
- libgio]],
-
- [['src/libsystemd/sd-bus/test-bus-creds.c'],
- [],
- []],
-
- [['src/libsystemd/sd-bus/test-bus-match.c'],
- [],
- []],
-
- [['src/libsystemd/sd-bus/test-bus-kernel.c'],
- [],
- []],
-
- [['src/libsystemd/sd-bus/test-bus-kernel-bloom.c'],
- [],
- []],
-
- [['src/libsystemd/sd-bus/test-bus-benchmark.c'],
- [],
- [threads]],
-
- [['src/libsystemd/sd-bus/test-bus-zero-copy.c'],
- [],
- []],
-
- [['src/libsystemd/sd-bus/test-bus-introspect.c'],
- [],
- []],
-
- [['src/libsystemd/sd-event/test-event.c'],
- [],
- []],
-
- [['src/libsystemd/sd-netlink/test-netlink.c'],
- [],
- []],
-
- [['src/libsystemd/sd-netlink/test-local-addresses.c'],
- [],
- []],
-
- [['src/libsystemd/sd-resolve/test-resolve.c'],
- [],
- [threads]],
-
- [['src/libsystemd/sd-login/test-login.c'],
- [],
- [],
- '', 'manual'],
- ]
diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 9fc3a3c742..f7bd62e3dd 100644
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -26,7 +26,8 @@ libudev = shared_library(
link_args : ['-shared',
'-Wl,--version-script=' + libudev_sym_path],
link_with : [libbasic,
- libsystemd],
+ libsystemd_internal],
+ dependencies : [threads],
link_depends : libudev_sym,
install : true,
install_dir : rootlibdir)
diff --git a/src/machine/meson.build b/src/machine/meson.build
index 1d83fece05..bf4f88f1aa 100644
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -41,7 +41,9 @@ endif
tests += [
[['src/machine/test-machine-tables.c'],
[libmachine_core,
- libshared],
- [],
+ libshared_static,
+ libsystemd_internal,
+ libudev],
+ [threads],
'ENABLE_MACHINED'],
]
diff --git a/src/network/meson.build b/src/network/meson.build
index 8a15016307..a41ead952b 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -115,13 +115,15 @@ endif
tests += [
[['src/network/test-networkd-conf.c'],
[libnetworkd_core,
- libsystemd_network],
+ libsystemd_network,
+ libudev],
[]],
[['src/network/test-network.c'],
[libnetworkd_core,
libudev_internal,
libsystemd_network,
+ libsystemd_internal,
libfirewall],
[libiptc]],
@@ -132,6 +134,7 @@ tests += [
libudev_internal,
libudev_core,
libsystemd_network,
+ libsystemd_internal,
libfirewall],
[],
'', '', [],
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 5ece75b5be..c06cc997ad 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -173,7 +173,8 @@ tests += [
[['src/resolve/test-dnssec-complex.c',
'src/resolve/dns-type.c',
dns_type_headers],
- [libshared],
+ [libshared,
+ libsystemd_internal],
[],
'ENABLE_RESOLVED', 'manual'],
]
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 3024db6a44..3608575be4 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -126,7 +126,7 @@ libshared = shared_library(
link_args : ['-shared'],
c_args : ['-fvisibility=default'],
link_with : [libsystemd_journal_internal,
- libsystemd,
+ libsystemd_internal,
libudev,
],
dependencies : [threads,
diff --git a/src/test/meson.build b/src/test/meson.build
index 568378e381..6c950c3f0c 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -45,7 +45,7 @@ tests += [
[['src/test/test-engine.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -56,7 +56,7 @@ tests += [
[['src/test/test-job-type.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -67,7 +67,7 @@ tests += [
[['src/test/test-ns.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -79,7 +79,7 @@ tests += [
[['src/test/test-loopback.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -90,7 +90,7 @@ tests += [
[['src/test/test-hostname.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -112,7 +112,7 @@ tests += [
[['src/test/test-unit-name.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -123,7 +123,7 @@ tests += [
[['src/test/test-unit-file.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -156,7 +156,8 @@ tests += [
[]],
[['src/test/test-condition.c'],
- [libshared],
+ [libsystemd_internal,
+ libshared],
[]],
[['src/test/test-fdset.c'],
@@ -287,8 +288,9 @@ tests += [
[['src/test/test-namespace.c'],
[libcore,
libudev,
- libsystemd],
- [libblkid]],
+ libsystemd_internal],
+ [threads,
+ libblkid]],
[['src/test/test-verbs.c'],
[libshared],
@@ -368,7 +370,8 @@ tests += [
libjournal_core,
libudev_core,
libudev_internal,
- libsystemd_network],
+ libsystemd_network,
+ libsystemd_internal],
[threads,
libseccomp,
libmount,
@@ -418,7 +421,8 @@ tests += [
'HAVE_LIBIPTC'],
[['src/test/test-netlink-manual.c'],
- [libshared],
+ [libshared,
+ libsystemd_internal],
[libkmod],
'', 'manual'],
@@ -459,7 +463,7 @@ tests += [
[['src/test/test-cgroup-mask.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -490,7 +494,7 @@ tests += [
[['src/test/test-path.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -501,7 +505,7 @@ tests += [
[['src/test/test-execute.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -519,7 +523,7 @@ tests += [
[['src/test/test-install.c'],
[libcore,
- libsystemd],
+ libsystemd_internal],
[],
'', 'manual'],
@@ -530,7 +534,7 @@ tests += [
[['src/test/test-sched-prio.c'],
[libcore,
libudev,
- libsystemd],
+ libsystemd_internal],
[threads,
librt,
libseccomp,
@@ -561,13 +565,15 @@ tests += [
[]],
[['src/test/test-libudev.c'],
- [libshared],
+ [libshared,
+ libudev],
[]],
[['src/test/test-udev.c'],
[libudev_core,
libudev_internal,
libsystemd_network,
+ libsystemd_internal,
libshared],
[librt,
libblkid,
@@ -576,7 +582,8 @@ tests += [
'', 'manual'],
[['src/test/test-id128.c'],
- [libshared],
+ [libshared,
+ libsystemd_internal],
[]],
[['src/test/test-hash.c'],
@@ -584,7 +591,8 @@ tests += [
[]],
[['src/test/test-nss.c'],
- [libshared],
+ [libshared,
+ libsystemd_internal],
[libdl],
'', 'manual'],
]
@@ -595,7 +603,8 @@ tests += [
tests += [
[['src/journal/test-journal.c'],
- [libjournal_core],
+ [libjournal_core,
+ libshared],
[threads,
libxz,
liblz4]],
@@ -603,87 +612,215 @@ tests += [
[['src/journal/test-journal-send.c'],
[libjournal_core,
libshared],
- []],
+ [threads,
+ libxz,
+ liblz4]],
[['src/journal/test-journal-syslog.c'],
[libjournal_core,
- libshared],
+ libshared,
+ libudev],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-match.c'],
- [libshared],
+ [libjournal_core,
+ libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-enum.c'],
- [libshared],
- []],
+ [libjournal_core,
+ libshared],
+ [threads,
+ libxz,
+ liblz4]],
[['src/journal/test-journal-stream.c'],
- [libshared],
+ [libjournal_core,
+ libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-flush.c'],
- [libshared],
+ [libjournal_core,
+ libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-init.c'],
- [libshared],
+ [libjournal_core,
+ libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-verify.c'],
- [libshared],
+ [libjournal_core,
+ libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-interleaving.c'],
- [libshared],
+ [libjournal_core,
+ libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-mmap-cache.c'],
- [libshared],
- []],
+ [libjournal_core,
+ libshared],
+ [threads,
+ libxz,
+ liblz4]],
[['src/journal/test-catalog.c'],
- [libshared],
- [],
+ [libjournal_core,
+ libshared],
+ [threads,
+ libxz,
+ liblz4],
'', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)],
[['src/journal/test-compress.c'],
- [libshared],
+ [libjournal_core,
+ libshared],
[liblz4,
libxz]],
[['src/journal/test-compress-benchmark.c'],
- [libshared],
+ [libjournal_core,
+ libshared],
[liblz4,
libxz]],
[['src/journal/test-audit-type.c'],
- [libshared],
- []],
+ [libjournal_core,
+ libshared],
+ [liblz4,
+ libxz]],
]
############################################################
tests += [
+ [['src/libsystemd/sd-bus/test-bus-marshal.c'],
+ [libsystemd_internal,
+ libshared],
+ [threads,
+ libglib,
+ libgobject,
+ libgio,
+ 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]],
+
[['src/libsystemd/sd-bus/test-bus-error.c'],
[libshared_static,
- libsystemd],
+ libsystemd_internal],
+ []],
+
+ [['src/libsystemd/sd-bus/test-bus-track.c'],
+ [],
+ [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'],
+ [],
+ []],
+
+ [['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'],
+]
############################################################
@@ -700,7 +837,8 @@ tests += [
'src/libsystemd-network/dhcp-internal.h',
'src/systemd/sd-dhcp-client.h'],
[libshared,
- libsystemd_network],
+ libsystemd_network,
+ libudev],
[]],
[['src/libsystemd-network/test-dhcp-server.c'],
@@ -718,14 +856,16 @@ tests += [
[['src/libsystemd-network/test-ipv4ll-manual.c',
'src/systemd/sd-ipv4ll.h'],
[libshared,
- libsystemd_network],
+ libsystemd_network,
+ libsystemd_internal],
[],
'', 'manual'],
[['src/libsystemd-network/test-acd.c',
'src/systemd/sd-ipv4acd.h'],
[libshared,
- libsystemd_network],
+ libsystemd_network,
+ libsystemd_internal],
[],
'', 'manual'],
@@ -770,6 +910,8 @@ tests += [
[['src/login/test-login-tables.c'],
[liblogind_core,
+ libsystemd_internal,
+ libudev,
libshared],
- []],
+ [threads]],
]
diff --git a/src/udev/meson.build b/src/udev/meson.build
index f3c68a9d45..dd8ec53cdf 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -105,7 +105,8 @@ executable('ata_id',
'ata_id/ata_id.c',
include_directories : includes,
link_with : [libudev_internal,
- libshared],
+ libshared,
+ libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -113,7 +114,8 @@ executable('cdrom_id',
'cdrom_id/cdrom_id.c',
include_directories : includes,
link_with : [libudev_internal,
- libshared],
+ libshared,
+ libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -121,7 +123,8 @@ executable('collect',
'collect/collect.c',
include_directories : includes,
link_with : [libudev_internal,
- libshared],
+ libshared,
+ libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -132,7 +135,8 @@ executable('scsi_id',
'scsi_id/scsi.h',
include_directories : includes,
link_with : [libudev_internal,
- libshared],
+ libshared,
+ libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -140,7 +144,8 @@ executable('v4l_id',
'v4l_id/v4l_id.c',
include_directories : includes,
link_with : [libudev_internal,
- libshared],
+ libshared,
+ libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
@@ -150,7 +155,8 @@ executable('mtd_probe',
'mtd_probe/probe_smartmedia.c',
include_directories : includes,
link_with : [libudev_internal,
- libshared],
+ libshared,
+ libsystemd_internal],
install : true,
install_dir : udevlibexecdir)
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-27 03:45:45 +0000