From 826472ce367cb93c64cc80225cab3fe5fd687363 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 10 Apr 2017 17:11:10 -0400 Subject: meson: update linking for fixed meson linking With mesonbuid/meson#1545, meson does not propagate deps of a library when linking with that library. That's of course the right thing to do, but it exposes a bunch of missing deps. This compiles with both meson-0.39.1 and meson-git + pr/1545. --- meson.build | 168 +++++++++++++++++++++----------- src/libsystemd/meson.build | 88 ----------------- src/libudev/meson.build | 3 +- src/machine/meson.build | 6 +- src/network/meson.build | 5 +- src/resolve/meson.build | 3 +- src/shared/meson.build | 2 +- src/test/meson.build | 232 ++++++++++++++++++++++++++++++++++++--------- src/udev/meson.build | 18 ++-- 9 files changed, 327 insertions(+), 198 deletions(-) diff --git a/meson.build b/meson.build index 154f380223..3f53b8a7e2 100644 --- a/meson.build +++ b/meson.build @@ -1053,7 +1053,9 @@ executable('systemd', systemd_sources, include_directories : includes, link_with : [libcore, - libshared], + libshared, + libudev, + libsystemd_internal], dependencies : [threads, librt, libseccomp, @@ -1067,6 +1069,8 @@ executable('systemd-analyze', systemd_analyze_sources, include_directories : includes, link_with : [libcore, + libudev, + libsystemd_internal, libshared], dependencies : [threads, librt, @@ -1101,8 +1105,10 @@ executable('systemd-cat', executable('journalctl', journalctl_sources, include_directories : includes, - link_with : [libshared, - libudev], + link_with : [libsystemd_journal_internal, + libshared, + libudev, + libsystemd_internal], dependencies : [threads, libqrencode, libxz, @@ -1138,7 +1144,8 @@ if conf.get('ENABLE_ENVIRONMENT_D', 0) == 1 install : true, install_dir : userenvgeneratordir, include_directories : includes, - link_with : [libshared]) + link_with : [libshared, + libsystemd_internal]) meson.add_install_script(meson_make_symlink, sysconfdir + '/environment', @@ -1168,7 +1175,9 @@ if conf.get('HAVE_BLKID', 0) == 1 install : true, install_dir : systemgeneratordir, include_directories : includes, - link_with : libshared, + link_with : [libsystemd_internal, + libshared, + libudev], dependencies : libblkid) executable('systemd-dissect', @@ -1184,7 +1193,7 @@ if conf.get('ENABLE_RESOLVED', 0) == 1 systemd_resolved_sources, include_directories : includes, link_with : [libshared, - ], + libsystemd_internal], dependencies : [threads, libm, libidn], @@ -1195,7 +1204,7 @@ if conf.get('ENABLE_RESOLVED', 0) == 1 systemd_resolve_sources, include_directories : includes, link_with : [libshared, - ], + libsystemd_internal], dependencies : [threads, libm, libidn], @@ -1207,7 +1216,9 @@ if conf.get('ENABLE_LOGIND', 0) == 1 systemd_logind_sources, include_directories : includes, link_with : [liblogind_core, - libshared], + libudev, + libshared, + libsystemd_internal], dependencies : [threads, libacl], install : true, @@ -1216,7 +1227,9 @@ if conf.get('ENABLE_LOGIND', 0) == 1 executable('loginctl', loginctl_sources, include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libudev, + libsystemd_internal], dependencies : [threads, liblz4, libxz], @@ -1226,7 +1239,8 @@ if conf.get('ENABLE_LOGIND', 0) == 1 executable('systemd-inhibit', 'src/login/inhibit.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootbindir) @@ -1239,8 +1253,10 @@ if conf.get('ENABLE_LOGIND', 0) == 1 include_directories : includes, link_args : ['-shared', '-Wl,--version-script=' + version_script_arg], - link_with : [libshared], - dependencies : [libpam, + link_with : [libsystemd_internal, + libshared_static], + dependencies : [threads, + libpam, libpam_misc], link_depends : pam_systemd_sym, install : true, @@ -1274,7 +1290,8 @@ executable('systemd-socket-activate', 'src/activate/activate.c', executable('systemctl', 'src/systemctl/systemctl.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], dependencies : [threads, libcap, libselinux, @@ -1287,7 +1304,8 @@ if conf.get('ENABLE_BACKLIGHT', 0) == 1 executable('systemd-backlight', 'src/backlight/backlight.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libudev], install : true, install_dir : rootlibexecdir) endif @@ -1296,7 +1314,8 @@ if conf.get('ENABLE_RFKILL', 0) == 1 executable('systemd-rfkill', 'src/rfkill/rfkill.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libudev], install : true, install_dir : rootlibexecdir) endif @@ -1312,7 +1331,8 @@ if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1 executable('systemd-cryptsetup', 'src/cryptsetup/cryptsetup.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], dependencies : [libcryptsetup], install : true, install_dir : rootlibexecdir) @@ -1336,7 +1356,8 @@ if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1 executable('systemd-veritysetup-generator', 'src/veritysetup/veritysetup-generator.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], dependencies : [libcryptsetup], install : true, install_dir : systemgeneratordir) @@ -1369,7 +1390,8 @@ if conf.get('ENABLE_HOSTNAMED', 0) == 1 executable('hostnamectl', 'src/hostname/hostnamectl.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true) endif @@ -1377,7 +1399,8 @@ if conf.get('ENABLE_LOCALED', 0) == 1 executable('systemd-localed', systemd_localed_sources, include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], dependencies : [libdl], install : true, install_dir : rootlibexecdir) @@ -1385,7 +1408,8 @@ if conf.get('ENABLE_LOCALED', 0) == 1 executable('localectl', localectl_sources, include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true) endif @@ -1393,14 +1417,16 @@ if conf.get('ENABLE_TIMEDATED', 0) == 1 executable('systemd-timedated', 'src/timedate/timedated.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootlibexecdir) executable('timedatectl', 'src/timedate/timedatectl.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true) endif @@ -1408,7 +1434,8 @@ if conf.get('ENABLE_TIMESYNCD', 0) == 1 executable('systemd-timesyncd', systemd_timesyncd_sources, include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], dependencies : [threads, libm], install : true, @@ -1420,14 +1447,16 @@ if conf.get('ENABLE_MACHINED', 0) == 1 systemd_machined_sources, include_directories : includes, link_with : [libmachine_core, - libshared], + libshared, + libsystemd_internal], install : true, install_dir : rootlibexecdir) executable('machinectl', 'src/machine/machinectl.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], dependencies : [threads, libxz, liblz4], @@ -1439,7 +1468,9 @@ if conf.get('ENABLE_IMPORTD', 0) == 1 executable('systemd-importd', systemd_importd_sources, include_directories : includes, - link_with : [libshared], + link_with : [libsystemd_internal, + libshared], + dependencies : [threads], install : true, install_dir : rootlibexecdir) @@ -1482,7 +1513,8 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 executable('systemd-journal-upload', systemd_journal_upload_sources, include_directories : includes, - link_with : [libshared], + link_with : [libsystemd_journal_internal, + libshared], dependencies : [threads, libcurl, libgnutls, @@ -1496,7 +1528,8 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 executable('systemd-journal-remote', systemd_journal_remote_sources, include_directories : includes, - link_with : [libshared], + link_with : [libsystemd_journal_internal, + libshared], dependencies : [threads, libmicrohttpd, libgnutls, @@ -1508,7 +1541,8 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 executable('systemd-journal-gatewayd', systemd_journal_gatewayd_sources, include_directories : includes, - link_with : [libshared], + link_with : [libsystemd_journal_internal, + libshared], dependencies : [threads, libmicrohttpd, libgnutls, @@ -1522,7 +1556,9 @@ if conf.get('ENABLE_COREDUMP', 0) == 1 executable('systemd-coredump', systemd_coredump_sources, include_directories : includes, - link_with : [libshared], + link_with : [libsystemd_journal_internal, + libshared, + libsystemd], dependencies : [threads, libacl, libdw, @@ -1534,7 +1570,9 @@ if conf.get('ENABLE_COREDUMP', 0) == 1 executable('coredumpctl', coredumpctl_sources, include_directories : includes, - link_with : [libshared], + link_with : [libsystemd_journal_internal, + libshared, + libsystemd_internal], dependencies : [threads, libxz, liblz4], @@ -1597,14 +1635,16 @@ executable('systemd-machine-id-setup', 'src/core/machine-id-setup.c', 'src/core/machine-id-setup.h', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootbindir) executable('systemd-fsck', 'src/fsck/fsck.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootlibexecdir) @@ -1672,53 +1712,62 @@ executable('systemd-cgroups-agent', executable('systemd-path', 'src/path/path.c', include_directories : includes, - link_with : [libshared], + link_with : [libsystemd_internal, + libshared], install : true) executable('systemd-ask-password', 'src/ask-password/ask-password.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootbindir) executable('systemd-reply-password', 'src/reply-password/reply-password.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootlibexecdir) executable('systemd-tty-ask-password-agent', 'src/tty-ask-password-agent/tty-ask-password-agent.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootbindir) executable('systemd-cgls', 'src/cgls/cgls.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true) executable('systemd-cgtop', 'src/cgtop/cgtop.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true) executable('systemd-initctl', 'src/initctl/initctl.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootlibexecdir) executable('systemd-mount', 'src/mount/mount-tool.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal, + libudev], install : true) meson.add_install_script(meson_make_symlink, @@ -1727,13 +1776,15 @@ meson.add_install_script(meson_make_symlink, executable('systemd-run', 'src/run/run.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true) executable('systemd-stdio-bridge', 'src/stdio-bridge/stdio-bridge.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true) executable('busctl', @@ -1741,7 +1792,8 @@ executable('busctl', 'src/busctl/busctl-introspect.c', 'src/busctl/busctl-introspect.h', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true) if conf.get('ENABLE_SYSUSERS', 0) == 1 @@ -1768,7 +1820,8 @@ if conf.get('ENABLE_HWDB', 0) == 1 'src/hwdb/hwdb.c', 'src/libsystemd/sd-hwdb/hwdb-internal.h', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], install : true, install_dir : rootbindir) endif @@ -1786,7 +1839,7 @@ executable('systemd-socket-proxyd', 'src/socket-proxy/socket-proxyd.c', include_directories : includes, link_with : [libshared, - libsystemd], + libsystemd_internal], dependencies : [threads], install : true, install_dir : rootlibexecdir) @@ -1797,6 +1850,7 @@ executable('systemd-udevd', link_with : [libudev_core, libudev_internal, libsystemd_network, + libsystemd_internal, libshared], dependencies : [libkmod, libidn, @@ -1810,7 +1864,8 @@ executable('udevadm', link_with : [libudev_core, libudev_internal, libsystemd_network, - libshared], + libshared, + libsystemd_internal], dependencies : [libkmod, libidn, libacl], @@ -1820,7 +1875,8 @@ executable('udevadm', executable('systemd-shutdown', systemd_shutdown_sources, include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libudev], install : true, install_dir : rootlibexecdir) @@ -1834,7 +1890,8 @@ executable('systemd-update-done', executable('systemd-update-utmp', 'src/update-utmp/update-utmp.c', include_directories : includes, - link_with : [libshared], + link_with : [libshared, + libsystemd_internal], dependencies : [libaudit], install : true, install_dir : rootlibexecdir) @@ -1862,7 +1919,9 @@ executable('systemd-nspawn', 'src/core/loopback-setup.h', include_directories : [includes, include_directories('src/nspawn')], link_with : [libfirewall, - libshared], + libshared, + libudev, + libsystemd_internal], dependencies : [libacl, libblkid, libseccomp, @@ -1876,7 +1935,8 @@ executable('systemd-networkd', libfirewall, libsystemd_network, libudev_internal, - libshared], + libshared, + libsystemd_internal], install : true, install_dir : rootlibexecdir) @@ -1884,7 +1944,8 @@ executable('systemd-networkd-wait-online', systemd_networkd_wait_online_sources, include_directories : includes, link_with : [libnetworkd_core, - libshared], + libshared, + libsystemd_internal], install : true, install_dir : rootlibexecdir) @@ -1892,7 +1953,8 @@ executable('networkctl', networkctl_sources, include_directories : includes, link_with : [libsystemd_network, - libshared], + libshared, + libsystemd_internal], install : true, install_dir : rootbindir) 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) -- cgit v1.2.3-54-g00ecf