diff options
| -rw-r--r-- | meson.build | 163 | ||||
| -rw-r--r-- | src/journal/meson.build | 14 | ||||
| -rw-r--r-- | src/libudev/meson.build | 11 | ||||
| -rw-r--r-- | src/machine/meson.build | 3 | ||||
| -rw-r--r-- | src/network/meson.build | 4 | ||||
| -rw-r--r-- | src/resolve/meson.build | 9 | ||||
| -rw-r--r-- | src/shared/meson.build | 9 | ||||
| -rw-r--r-- | src/test/meson.build | 303 | ||||
| -rw-r--r-- | src/udev/meson.build | 24 |
9 files changed, 221 insertions, 319 deletions
diff --git a/meson.build b/meson.build index 4406db980c..2b719ec257 100644 --- a/meson.build +++ b/meson.build @@ -1024,16 +1024,13 @@ libjournal_core = static_library( libjournal_core_sources, journald_gperf_c, include_directories : includes, - link_with : [libbasic, - libsystemd_internal, - libsystemd_journal_internal], install : false) libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym) libsystemd = shared_library( 'systemd', libsystemd_internal_sources, - libsystemd_journal_internal_sources, + journal_internal_sources, version : '0.18.0', include_directories : includes, link_args : ['-shared', @@ -1122,8 +1119,7 @@ executable('systemd', include_directories : includes, link_with : [libcore, libshared, - libudev, - libsystemd_internal], + libudev], dependencies : [threads, librt, libseccomp, @@ -1139,7 +1135,6 @@ exe = executable('systemd-analyze', include_directories : includes, link_with : [libcore, libudev, - libsystemd_internal, libshared], dependencies : [threads, librt, @@ -1154,13 +1149,13 @@ public_programs += [exe] executable('systemd-journald', systemd_journald_sources, include_directories : includes, - link_with : [libsystemd_journal_internal, - libjournal_core, + link_with : [libjournal_core, libshared, libudev], dependencies : [threads, libxz, - liblz4], + liblz4, + libselinux], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1179,10 +1174,8 @@ public_programs += [exe] exe = executable('journalctl', journalctl_sources, include_directories : includes, - link_with : [libsystemd_journal_internal, - libshared, - libudev, - libsystemd_internal], + link_with : [libshared, + libudev], dependencies : [threads, libqrencode, libxz, @@ -1221,8 +1214,7 @@ if conf.get('ENABLE_ENVIRONMENT_D', 0) == 1 executable('30-systemd-environment-d-generator', 'src/environment-d-generator/environment-d-generator.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : userenvgeneratordir) @@ -1255,8 +1247,7 @@ if conf.get('HAVE_BLKID', 0) == 1 'src/gpt-auto-generator/gpt-auto-generator.c', 'src/basic/blkid-util.h', include_directories : includes, - link_with : [libsystemd_internal, - libshared, + link_with : [libshared, libudev], dependencies : libblkid, install_rpath : rootlibexecdir, @@ -1277,8 +1268,7 @@ if conf.get('ENABLE_RESOLVED', 0) == 1 executable('systemd-resolved', systemd_resolved_sources, include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [threads, libm, libidn], @@ -1289,8 +1279,7 @@ if conf.get('ENABLE_RESOLVED', 0) == 1 exe = executable('systemd-resolve', systemd_resolve_sources, include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [threads, libm, libidn], @@ -1304,9 +1293,8 @@ if conf.get('ENABLE_LOGIND', 0) == 1 systemd_logind_sources, include_directories : includes, link_with : [liblogind_core, - libudev, libshared, - libsystemd_internal], + libudev], dependencies : [threads, libacl], install_rpath : rootlibexecdir, @@ -1317,8 +1305,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1 loginctl_sources, include_directories : includes, link_with : [libshared, - libudev, - libsystemd_internal], + libudev], dependencies : [threads, liblz4, libxz], @@ -1330,8 +1317,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1 exe = executable('systemd-inhibit', 'src/login/inhibit.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) @@ -1388,8 +1374,7 @@ public_programs += [exe] exe = executable('systemctl', 'src/systemctl/systemctl.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [threads, libcap, libselinux, @@ -1434,8 +1419,7 @@ if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1 executable('systemd-cryptsetup', 'src/cryptsetup/cryptsetup.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [libcryptsetup], install_rpath : rootlibexecdir, install : true, @@ -1462,8 +1446,7 @@ if conf.get('HAVE_LIBCRYPTSETUP', 0) == 1 executable('systemd-veritysetup-generator', 'src/veritysetup/veritysetup-generator.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [libcryptsetup], install_rpath : rootlibexecdir, install : true, @@ -1500,8 +1483,7 @@ if conf.get('ENABLE_HOSTNAMED', 0) == 1 exe = executable('hostnamectl', 'src/hostname/hostnamectl.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -1518,8 +1500,7 @@ if conf.get('ENABLE_LOCALED', 0) == 1 executable('systemd-localed', systemd_localed_sources, include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : deps, install_rpath : rootlibexecdir, install : true, @@ -1528,8 +1509,7 @@ if conf.get('ENABLE_LOCALED', 0) == 1 exe = executable('localectl', localectl_sources, include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -1539,8 +1519,7 @@ if conf.get('ENABLE_TIMEDATED', 0) == 1 executable('systemd-timedated', 'src/timedate/timedated.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1549,8 +1528,7 @@ if conf.get('ENABLE_TIMEDATED', 0) == 1 'src/timedate/timedatectl.c', include_directories : includes, install_rpath : rootlibexecdir, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install : true) public_programs += [exe] endif @@ -1559,8 +1537,7 @@ if conf.get('ENABLE_TIMESYNCD', 0) == 1 executable('systemd-timesyncd', systemd_timesyncd_sources, include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [threads, libm], install_rpath : rootlibexecdir, @@ -1573,8 +1550,7 @@ if conf.get('ENABLE_MACHINED', 0) == 1 systemd_machined_sources, include_directories : includes, link_with : [libmachine_core, - libshared, - libsystemd_internal], + libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1582,8 +1558,7 @@ if conf.get('ENABLE_MACHINED', 0) == 1 exe = executable('machinectl', 'src/machine/machinectl.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [threads, libxz, liblz4], @@ -1597,8 +1572,7 @@ if conf.get('ENABLE_IMPORTD', 0) == 1 executable('systemd-importd', systemd_importd_sources, include_directories : includes, - link_with : [libsystemd_internal, - libshared], + link_with : [libshared], dependencies : [threads], install_rpath : rootlibexecdir, install : true, @@ -1647,8 +1621,7 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_LIBCURL', 0) == 1 exe = executable('systemd-journal-upload', systemd_journal_upload_sources, include_directories : includes, - link_with : [libsystemd_journal_internal, - libshared], + link_with : [libshared], dependencies : [threads, libcurl, libgnutls, @@ -1664,8 +1637,7 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 s_j_remote = executable('systemd-journal-remote', systemd_journal_remote_sources, include_directories : includes, - link_with : [libsystemd_journal_internal, - libshared], + link_with : [libshared], dependencies : [threads, libmicrohttpd, libgnutls, @@ -1678,8 +1650,7 @@ if conf.get('ENABLE_REMOTE', 0) == 1 and conf.get('HAVE_MICROHTTPD', 0) == 1 s_j_gatewayd = executable('systemd-journal-gatewayd', systemd_journal_gatewayd_sources, include_directories : includes, - link_with : [libsystemd_journal_internal, - libshared], + link_with : [libshared], dependencies : [threads, libmicrohttpd, libgnutls, @@ -1695,9 +1666,7 @@ if conf.get('ENABLE_COREDUMP', 0) == 1 executable('systemd-coredump', systemd_coredump_sources, include_directories : includes, - link_with : [libsystemd_journal_internal, - libshared, - libsystemd], + link_with : [libshared], dependencies : [threads, libacl, libdw, @@ -1710,9 +1679,7 @@ if conf.get('ENABLE_COREDUMP', 0) == 1 exe = executable('coredumpctl', coredumpctl_sources, include_directories : includes, - link_with : [libsystemd_journal_internal, - libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [threads, libxz, liblz4], @@ -1783,8 +1750,7 @@ executable('systemd-machine-id-setup', 'src/core/machine-id-setup.c', 'src/core/machine-id-setup.h', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) @@ -1792,8 +1758,7 @@ executable('systemd-machine-id-setup', executable('systemd-fsck', 'src/fsck/fsck.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1876,8 +1841,7 @@ executable('systemd-cgroups-agent', exe = executable('systemd-path', 'src/path/path.c', include_directories : includes, - link_with : [libsystemd_internal, - libshared], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -1885,8 +1849,7 @@ public_programs += [exe] exe = executable('systemd-ask-password', 'src/ask-password/ask-password.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) @@ -1895,8 +1858,7 @@ public_programs += [exe] executable('systemd-reply-password', 'src/reply-password/reply-password.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1904,8 +1866,7 @@ executable('systemd-reply-password', exe = executable('systemd-tty-ask-password-agent', 'src/tty-ask-password-agent/tty-ask-password-agent.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) @@ -1914,8 +1875,7 @@ public_programs += [exe] exe = executable('systemd-cgls', 'src/cgls/cgls.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -1923,8 +1883,7 @@ public_programs += [exe] exe = executable('systemd-cgtop', 'src/cgtop/cgtop.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -1932,8 +1891,7 @@ public_programs += [exe] executable('systemd-initctl', 'src/initctl/initctl.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -1942,7 +1900,6 @@ exe = executable('systemd-mount', 'src/mount/mount-tool.c', include_directories : includes, link_with : [libshared, - libsystemd_internal, libudev], install_rpath : rootlibexecdir, install : true) @@ -1954,8 +1911,7 @@ meson.add_install_script(meson_make_symlink, exe = executable('systemd-run', 'src/run/run.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -1963,8 +1919,7 @@ public_programs += [exe] exe = executable('systemd-stdio-bridge', 'src/stdio-bridge/stdio-bridge.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -1974,8 +1929,7 @@ exe = executable('busctl', 'src/busctl/busctl-introspect.c', 'src/busctl/busctl-introspect.h', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true) public_programs += [exe] @@ -2008,8 +1962,7 @@ if conf.get('ENABLE_HWDB', 0) == 1 'src/hwdb/hwdb.c', 'src/libsystemd/sd-hwdb/hwdb-internal.h', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) @@ -2029,8 +1982,7 @@ endif exe = executable('systemd-socket-proxyd', 'src/socket-proxy/socket-proxyd.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [threads], install_rpath : rootlibexecdir, install : true, @@ -2043,11 +1995,11 @@ exe = executable('systemd-udevd', link_with : [libudev_core, libudev_internal, libsystemd_network, - libsystemd_internal, libshared], dependencies : [libkmod, libidn, - libacl], + libacl, + libblkid], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -2059,11 +2011,11 @@ exe = executable('udevadm', link_with : [libudev_core, libudev_internal, libsystemd_network, - libshared, - libsystemd_internal], + libshared], dependencies : [libkmod, libidn, - libacl], + libacl, + libblkid], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) @@ -2089,8 +2041,7 @@ executable('systemd-update-done', executable('systemd-update-utmp', 'src/update-utmp/update-utmp.c', include_directories : includes, - link_with : [libshared, - libsystemd_internal], + link_with : [libshared], dependencies : [libaudit], install_rpath : rootlibexecdir, install : true, @@ -2121,8 +2072,7 @@ exe = executable('systemd-nspawn', include_directories : [includes, include_directories('src/nspawn')], link_with : [libfirewall, libshared, - libudev, - libsystemd_internal], + libudev], dependencies : [libacl, libblkid, libseccomp, @@ -2139,8 +2089,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1 libfirewall, libsystemd_network, libudev_internal, - libshared, - libsystemd_internal], + libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -2149,8 +2098,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1 systemd_networkd_wait_online_sources, include_directories : includes, link_with : [libnetworkd_core, - libshared, - libsystemd_internal], + libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootlibexecdir) @@ -2160,8 +2108,7 @@ exe = executable('networkctl', networkctl_sources, include_directories : includes, link_with : [libsystemd_network, - libshared, - libsystemd_internal], + libshared], install_rpath : rootlibexecdir, install : true, install_dir : rootbindir) diff --git a/src/journal/meson.build b/src/journal/meson.build index 360c52b92d..a1d33d0810 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -1,6 +1,6 @@ # -*- mode: meson -*- -libsystemd_journal_internal_sources = files(''' +journal_internal_sources = files(''' audit-type.c audit-type.h catalog.c @@ -45,20 +45,10 @@ audit_type_to_name = custom_target( command : [awk, '-f', '@INPUT0@', '@INPUT1@'], capture : true) -libsystemd_journal_internal_sources += [audit_type_to_name] +journal_internal_sources += [audit_type_to_name] ############################################################ -libsystemd_journal_internal = static_library( - 'systemd-journal-internal', - libsystemd_journal_internal_sources, - gcrypt_util_sources, - install : false, - include_directories : includes, - link_with : libbasic, - dependencies : [libaudit, - ]) - libjournal_core_sources = files(''' journald-kmsg.c journald-kmsg.h diff --git a/src/libudev/meson.build b/src/libudev/meson.build index f7bd62e3dd..6c5ebebb7c 100644 --- a/src/libudev/meson.build +++ b/src/libudev/meson.build @@ -1,6 +1,6 @@ # -*- mode: meson -*- -libudev_sources = ''' +libudev_sources = files(''' libudev-private.h libudev-device-internal.h libudev.c @@ -12,7 +12,7 @@ libudev_sources = ''' libudev-monitor.c libudev-queue.c libudev-hwdb.c -'''.split() +'''.split()) ############################################################ @@ -32,13 +32,6 @@ libudev = shared_library( install : true, install_dir : rootlibdir) -libudev_internal = static_library( - 'udev', - libudev_sources, - include_directories : includes, - link_with : [libbasic, - libsystemd]) - install_headers('libudev.h') libudev_h_path = '@0@/libudev.h'.format(meson.current_source_dir()) diff --git a/src/machine/meson.build b/src/machine/meson.build index de98246282..515defcb6c 100644 --- a/src/machine/meson.build +++ b/src/machine/meson.build @@ -41,8 +41,7 @@ endif tests += [ [['src/machine/test-machine-tables.c'], [libmachine_core, - libshared_static, - libsystemd_internal, + libshared, libudev], [threads], 'ENABLE_MACHINED'], diff --git a/src/network/meson.build b/src/network/meson.build index 4cde777292..1e8da8cfb7 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -128,7 +128,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1 [libnetworkd_core, libudev_internal, libsystemd_network, - libsystemd_internal, + libshared, libfirewall], [libiptc]], @@ -139,7 +139,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1 libudev_internal, libudev_core, libsystemd_network, - libsystemd_internal, + libshared, libfirewall], [], '', '', [], diff --git a/src/resolve/meson.build b/src/resolve/meson.build index c06cc997ad..f0bbce49c4 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -149,7 +149,7 @@ tests += [ basic_dns_sources, dns_type_headers, 'src/shared/test-tables.h'], - [libshared], + [], [libgcrypt, libm], 'ENABLE_RESOLVED'], @@ -157,7 +157,7 @@ tests += [ [['src/resolve/test-dns-packet.c', basic_dns_sources, dns_type_headers], - [libshared], + [], [libgcrypt, libm], 'ENABLE_RESOLVED'], @@ -165,7 +165,7 @@ tests += [ [['src/resolve/test-dnssec.c', basic_dns_sources, dns_type_headers], - [libshared], + [], [libgcrypt, libm], 'ENABLE_RESOLVED'], @@ -173,8 +173,7 @@ tests += [ [['src/resolve/test-dnssec-complex.c', 'src/resolve/dns-type.c', dns_type_headers], - [libshared, - libsystemd_internal], + [], [], 'ENABLE_RESOLVED', 'manual'], ] 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) 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]], ] diff --git a/src/udev/meson.build b/src/udev/meson.build index 19dc522172..e7feaedb4f 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -92,6 +92,12 @@ link_config_gperf_c = custom_target( ############################################################ +libudev_internal = static_library( + 'udev', + libudev_sources, + include_directories : includes, + link_with : [libshared]) + libudev_core_includes = [includes, include_directories('net')] libudev_core = static_library( 'udev-core', @@ -105,8 +111,7 @@ executable('ata_id', 'ata_id/ata_id.c', include_directories : includes, link_with : [libudev_internal, - libshared, - libsystemd_internal], + libshared], install : true, install_dir : udevlibexecdir) @@ -114,8 +119,7 @@ executable('cdrom_id', 'cdrom_id/cdrom_id.c', include_directories : includes, link_with : [libudev_internal, - libshared, - libsystemd_internal], + libshared], install : true, install_dir : udevlibexecdir) @@ -123,8 +127,7 @@ executable('collect', 'collect/collect.c', include_directories : includes, link_with : [libudev_internal, - libshared, - libsystemd_internal], + libshared], install : true, install_dir : udevlibexecdir) @@ -135,8 +138,7 @@ executable('scsi_id', 'scsi_id/scsi.h', include_directories : includes, link_with : [libudev_internal, - libshared, - libsystemd_internal], + libshared], install : true, install_dir : udevlibexecdir) @@ -144,8 +146,7 @@ executable('v4l_id', 'v4l_id/v4l_id.c', include_directories : includes, link_with : [libudev_internal, - libshared, - libsystemd_internal], + libshared], install : true, install_dir : udevlibexecdir) @@ -155,8 +156,7 @@ executable('mtd_probe', 'mtd_probe/probe_smartmedia.c', include_directories : includes, link_with : [libudev_internal, - libshared, - libsystemd_internal], + libshared], install : true, install_dir : udevlibexecdir) |