SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: adjust naming of '*extract*' variables

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-07-07 13:40:13 +02:00
parent f00ccf93b7
commit aad1e61010
19 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/analyze/meson.build
+2 -2
View File
@@ -40,7 +40,7 @@ systemd_analyze_sources = files(
'analyze-verify.c',
'analyze.c',
)
systemd_analyze_extract_sources = files(
systemd_analyze_export_sources = files(
'analyze-verify-util.c'
)
@@ -49,7 +49,7 @@ executables += [
'name' : 'systemd-analyze',
'public' : conf.get('ENABLE_ANALYZE') == 1,
'sources' : systemd_analyze_sources,
'export' : systemd_analyze_extract_sources,
'export' : systemd_analyze_export_sources,
'include_directories' : core_includes,
'link_with' : [
libcore,
src/busctl/meson.build
+2 -2
View File
@@ -3,7 +3,7 @@
busctl_sources = files(
'busctl.c',
)
busctl_extract_sources = files(
busctl_export_sources = files(
'busctl-introspect.c',
)
@@ -12,7 +12,7 @@ executables += [
'name' : 'busctl',
'public' : true,
'sources' : busctl_sources,
'export' : busctl_extract_sources,
'export' : busctl_export_sources,
},
test_template + {
'sources' : files('test-busctl-introspect.c'),
src/coredump/meson.build
+2 -2
View File
@@ -14,7 +14,7 @@ systemd_coredump_sources = files(
'coredump-send.c',
'coredump-submit.c',
)
systemd_coredump_extract_sources = files(
systemd_coredump_export_sources = files(
'coredump-vacuum.c',
)
@@ -36,7 +36,7 @@ executables += [
libexec_template + {
'name' : 'systemd-coredump',
'sources' : systemd_coredump_sources,
'export' : systemd_coredump_extract_sources,
'export' : systemd_coredump_export_sources,
'link_with' : [libshared],
'dependencies' : [
common_dependencies,
src/home/meson.build
+4 -4
View File
@@ -16,7 +16,7 @@ systemd_homed_sources = files(
'homed.c',
'user-record-sign.c',
)
systemd_homed_extract_sources = files(
systemd_homed_export_sources = files(
'home-util.c',
'user-record-password-quality.c',
'user-record-util.c',
@@ -51,7 +51,7 @@ homectl_sources = files(
'homectl.c',
)
homectl_extract = files(
homectl_export_sources = files(
'homectl-prompts.c',
)
@@ -66,7 +66,7 @@ executables += [
'name' : 'systemd-homed',
'dbus' : true,
'sources' : systemd_homed_sources,
'export' : systemd_homed_extract_sources,
'export' : systemd_homed_export_sources,
'dependencies' : libopenssl_cflags,
},
libexec_template + {
@@ -86,7 +86,7 @@ executables += [
'name' : 'homectl',
'public' : true,
'sources' : homectl_sources,
'export' : homectl_extract,
'export' : homectl_export_sources,
'import' : ['systemd-homed'],
'dependencies' : [
libfido2_cflags,
src/journal-remote/meson.build
+4 -4
View File
@@ -5,7 +5,7 @@ systemd_journal_gatewayd_sources = files(
)
systemd_journal_remote_sources = files('journal-remote-main.c')
systemd_journal_remote_extract_sources = files(
systemd_journal_remote_export_sources = files(
'journal-compression-util.c',
'journal-remote-parse.c',
'journal-remote-write.c',
@@ -16,7 +16,7 @@ systemd_journal_upload_sources = files(
'journal-upload-journal.c',
'journal-upload.c',
)
systemd_journal_upload_extract_sources = files(
systemd_journal_upload_export_sources = files(
'journal-header-util.c',
)
@@ -46,7 +46,7 @@ executables += [
# Instead, we make sure we don't install it when the remote feature is disabled.
'install' : conf.get('ENABLE_REMOTE') == 1,
'sources' : systemd_journal_remote_sources,
'export' : systemd_journal_remote_extract_sources,
'export' : systemd_journal_remote_export_sources,
'dependencies' : common_deps + [libmicrohttpd_cflags],
},
libexec_template + {
@@ -57,7 +57,7 @@ executables += [
'HAVE_LIBCURL',
],
'sources' : systemd_journal_upload_sources,
'export' : systemd_journal_upload_extract_sources,
'export' : systemd_journal_upload_export_sources,
'import' : ['systemd-journal-remote'],
'dependencies' : [
common_deps,
src/journal/meson.build
+4 -4
View File
@@ -3,7 +3,7 @@
systemd_journald_sources = files(
'journald.c',
)
systemd_journald_extract_sources = files(
systemd_journald_export_sources = files(
'audit-type.c',
'journald-audit.c',
'journald-client.c',
@@ -28,7 +28,7 @@ journald_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += journald_gperf_c
systemd_journald_extract_sources += journald_gperf_c
systemd_journald_export_sources += journald_gperf_c
generate_audit_type_list = files('generate-audit_type-list.sh')
generate_audit_type_command = [env, 'bash', generate_audit_type_list, cpp]
@@ -53,7 +53,7 @@ audit_type_to_name = custom_target(
capture : true)
generated_sources += audit_type_to_name
systemd_journald_extract_sources += audit_type_to_name
systemd_journald_export_sources += audit_type_to_name
journalctl_sources = files(
'journalctl.c',
@@ -93,7 +93,7 @@ executables += [
libexec_template + {
'name' : 'systemd-journald',
'sources' : systemd_journald_sources,
'export' : systemd_journald_extract_sources,
'export' : systemd_journald_export_sources,
'dependencies' : [
libacl_cflags,
libaudit_cflags,
src/locale/meson.build
+2 -2
View File
@@ -7,7 +7,7 @@ endif
systemd_localed_sources = files(
'localed.c'
)
systemd_localed_extract_sources = files(
systemd_localed_export_sources = files(
'localed-util.c',
'xkbcommon-util.c',
)
@@ -29,7 +29,7 @@ executables += [
'name' : 'systemd-localed',
'dbus' : true,
'sources' : systemd_localed_sources,
'export' : systemd_localed_extract_sources,
'export' : systemd_localed_export_sources,
'dependencies' : libxkbcommon_deps,
},
executable_template + {
src/login/meson.build
+3 -3
View File
@@ -7,7 +7,7 @@ endif
systemd_logind_sources = files(
'logind.c',
)
systemd_logind_extract_sources = files(
systemd_logind_export_sources = files(
'logind-action.c',
'logind-brightness.c',
'logind-button.c',
@@ -35,7 +35,7 @@ logind_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += logind_gperf_c
systemd_logind_extract_sources += [logind_gperf_c]
systemd_logind_export_sources += [logind_gperf_c]
loginctl_sources = files(
'loginctl.c',
@@ -47,7 +47,7 @@ executables += [
'name' : 'systemd-logind',
'dbus' : true,
'sources' : systemd_logind_sources,
'export' : systemd_logind_extract_sources,
'export' : systemd_logind_export_sources,
'dependencies' : [
libacl_cflags,
],
src/machine/meson.build
+2 -2
View File
@@ -7,7 +7,7 @@ endif
systemd_machined_sources = files(
'machined.c'
)
systemd_machined_extract_sources = files(
systemd_machined_export_sources = files(
'image.c',
'image-dbus.c',
'image-varlink.c',
@@ -26,7 +26,7 @@ executables += [
'name' : 'systemd-machined',
'dbus' : true,
'sources' : systemd_machined_sources,
'export' : systemd_machined_extract_sources,
'export' : systemd_machined_export_sources,
},
executable_template + {
'name' : 'machinectl',
src/network/meson.build
+3 -3
View File
@@ -3,7 +3,7 @@
systemd_networkd_sources = files(
'networkd.c'
)
systemd_networkd_extract_sources = files(
systemd_networkd_export_sources = files(
'netdev/bareudp.c',
'netdev/batadv.c',
'netdev/bond.c',
@@ -161,7 +161,7 @@ netdev_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += [networkd_gperf_c, networkd_network_gperf_c, netdev_gperf_c]
systemd_networkd_extract_sources += [networkd_gperf_c, networkd_network_gperf_c, netdev_gperf_c]
systemd_networkd_export_sources += [networkd_gperf_c, networkd_network_gperf_c, netdev_gperf_c]
if get_option('link-networkd-shared')
networkd_link_with = [libshared]
@@ -198,7 +198,7 @@ executables += [
'dbus' : true,
'conditions' : ['ENABLE_NETWORKD'],
'sources' : systemd_networkd_sources,
'export' : systemd_networkd_extract_sources,
'export' : systemd_networkd_export_sources,
'include_directories' : network_includes,
'link_with' : [
libsystemd_network,
src/nspawn/meson.build
+3 -3
View File
@@ -13,7 +13,7 @@ nspawn_sources = files(
'nspawn-setuid.c',
'nspawn-stub-pid1.c',
)
nspawn_extract_sources = files(
nspawn_export_sources = files(
'nspawn-expose-ports.c',
'nspawn-mount.c',
'nspawn-network.c',
@@ -27,7 +27,7 @@ nspawn_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += nspawn_gperf_c
nspawn_extract_sources += nspawn_gperf_c
nspawn_export_sources += nspawn_gperf_c
nspawn_common_template = {
'dependencies' : libseccomp_cflags,
@@ -41,7 +41,7 @@ executables += [
'name' : 'systemd-nspawn',
'public' : true,
'sources' : nspawn_sources,
'export' : nspawn_extract_sources,
'export' : nspawn_export_sources,
'include_directories' : [
include_directories('.'),
executable_template['include_directories'],
src/nsresourced/meson.build
+2 -2
View File
@@ -8,7 +8,7 @@ systemd_nsresourced_sources = files(
'nsresourced-manager.c',
'nsresourced.c',
)
systemd_nsresourced_extract_sources = files(
systemd_nsresourced_export_sources = files(
'userns-restrict.c',
'userns-registry.c',
)
@@ -23,7 +23,7 @@ executables += [
libexec_template + {
'name' : 'systemd-nsresourced',
'sources' : systemd_nsresourced_sources,
'export' : systemd_nsresourced_extract_sources,
'export' : systemd_nsresourced_export_sources,
'dependencies' : [
libbpf_cflags,
],
src/oom/meson.build
+2 -2
View File
@@ -10,7 +10,7 @@ systemd_oomd_sources = files(
'oomd-manager.c',
'oomd-manager-bus.c',
)
systemd_oomd_extract_sources = files(
systemd_oomd_export_sources = files(
'oomd-util.c',
)
@@ -19,7 +19,7 @@ executables += [
'name' : 'systemd-oomd',
'dbus' : true,
'sources' : systemd_oomd_sources,
'export' : systemd_oomd_extract_sources,
'export' : systemd_oomd_export_sources,
'dependencies' : libatomic,
},
executable_template + {
src/resolve/meson.build
+4 -4
View File
@@ -7,7 +7,7 @@ endif
systemd_resolved_sources = files(
'resolved.c',
)
systemd_resolved_extract_sources = files(
systemd_resolved_export_sources = files(
'resolved-bus.c',
'resolved-conf.c',
'resolved-dns-browse-services.c',
@@ -59,10 +59,10 @@ resolved_dns_delegate_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += [resolved_gperf_c, resolved_dnssd_gperf_c, resolved_dns_delegate_gperf_c]
systemd_resolved_extract_sources += [resolved_gperf_c, resolved_dnssd_gperf_c, resolved_dns_delegate_gperf_c]
systemd_resolved_export_sources += [resolved_gperf_c, resolved_dnssd_gperf_c, resolved_dns_delegate_gperf_c]
if conf.get('ENABLE_DNS_OVER_TLS') == 1
systemd_resolved_extract_sources += files(
systemd_resolved_export_sources += files(
'resolved-dnstls.c',
)
endif
@@ -82,7 +82,7 @@ executables += [
'name' : 'systemd-resolved',
'dbus' : true,
'sources' : systemd_resolved_sources,
'export' : systemd_resolved_extract_sources,
'export' : systemd_resolved_export_sources,
},
executable_template + resolve_common_template + {
'name' : 'resolvectl',
src/systemctl/meson.build
+2 -2
View File
@@ -30,7 +30,7 @@ systemctl_sources = files(
'systemctl-trivial-method.c',
'systemctl-whoami.c',
)
systemctl_extract_sources = files(
systemctl_export_sources = files(
'systemctl-compat-halt.c',
'systemctl-compat-shutdown.c',
'systemctl-daemon-reload.c',
@@ -52,7 +52,7 @@ executables += [
'name' : 'systemctl',
'public' : true,
'sources' : systemctl_sources,
'export' : systemctl_extract_sources,
'export' : systemctl_export_sources,
'link_with' : systemctl_link_with,
'dependencies' : [
liblz4_cflags,
src/sysupdate/meson.build
+2 -2
View File
@@ -14,7 +14,7 @@ systemd_sysupdate_sources = files(
'sysupdate-update-set.c',
'sysupdate.c',
)
systemd_sysupdate_extract_sources = files(
systemd_sysupdate_export_sources = files(
'sysupdate-update-set-flags.c',
'sysupdate-util.c',
)
@@ -29,7 +29,7 @@ executables += [
'public' : true,
'conditions' : ['ENABLE_SYSUPDATE'],
'sources' : systemd_sysupdate_sources,
'export' : systemd_sysupdate_extract_sources,
'export' : systemd_sysupdate_export_sources,
'dependencies' : [
libfdisk_cflags,
libopenssl_cflags,
src/timesync/meson.build
+3 -3
View File
@@ -8,7 +8,7 @@ timesyncd_sources = files(
'timesyncd.c',
'timesyncd-bus.c',
)
timesyncd_extract_sources = files(
timesyncd_export_sources = files(
'timesyncd-conf.c',
'timesyncd-manager.c',
'timesyncd-server.c',
@@ -20,7 +20,7 @@ timesyncd_gperf_c = custom_target(
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
generated_sources += timesyncd_gperf_c
timesyncd_extract_sources += timesyncd_gperf_c
timesyncd_export_sources += timesyncd_gperf_c
if get_option('link-timesyncd-shared')
timesyncd_link_with = [libshared]
@@ -33,7 +33,7 @@ executables += [
libexec_template + {
'name' : 'systemd-timesyncd',
'sources' : timesyncd_sources,
'export' : timesyncd_extract_sources,
'export' : timesyncd_export_sources,
'link_with' : timesyncd_link_with,
'dependencies' : libm,
},
src/udev/meson.build
+7 -7
View File
@@ -17,7 +17,7 @@ udevadm_sources = files(
'udevadm.c',
'udevd.c',
)
udevadm_extract_sources = files(
udevadm_export_sources = files(
'net/link-config.c',
'udev-builtin.c',
'udev-builtin-btrfs.c',
@@ -48,19 +48,19 @@ udevadm_extract_sources = files(
)
if conf.get('HAVE_KMOD') == 1
udevadm_extract_sources += files('udev-builtin-kmod.c')
udevadm_export_sources += files('udev-builtin-kmod.c')
endif
if conf.get('HAVE_BLKID') == 1
udevadm_extract_sources += files('udev-builtin-blkid.c')
udevadm_export_sources += files('udev-builtin-blkid.c')
endif
if conf.get('HAVE_ACL') == 1
udevadm_extract_sources += files('udev-builtin-uaccess.c')
udevadm_export_sources += files('udev-builtin-uaccess.c')
endif
if conf.get('HAVE_TPM2') == 1
udevadm_extract_sources += files('udev-builtin-tpm2_id.c')
udevadm_export_sources += files('udev-builtin-tpm2_id.c')
endif
############################################################
@@ -101,7 +101,7 @@ link_config_gperf_c = custom_target(
output : 'link-config-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
udevadm_extract_sources += link_config_gperf_c
udevadm_export_sources += link_config_gperf_c
generated_sources += link_config_gperf_c
############################################################
@@ -150,7 +150,7 @@ udev_binaries_dict = [
'public' : true,
'sources' : udevadm_sources +
keyboard_keys_from_name_inc,
'export' : udevadm_extract_sources,
'export' : udevadm_export_sources,
'include_directories' : [
include_directories('.', 'net'),
libexec_template['include_directories'],
src/vmspawn/meson.build
+2 -2
View File
@@ -13,7 +13,7 @@ vmspawn_sources = files(
'vmspawn-scope.c',
'vmspawn-mount.c',
)
vmspawn_extract_sources = files(
vmspawn_export_sources = files(
'vmspawn-util.c',
'vmspawn-qemu-config.c',
)
@@ -23,7 +23,7 @@ executables += [
'name' : 'systemd-vmspawn',
'public' : true,
'sources' : vmspawn_sources,
'export' : vmspawn_extract_sources,
'export' : vmspawn_export_sources,
},
test_template + {
'sources' : files('test-vmspawn-util.c'),