Simplify source lists in meson config (#39811)

2026-04-14 00:14:32 +09:00 · 2025-11-20 13:20:41 +09:00
parent a7947d54db 5220bb8c3f
commit 5de39570c8
30 changed files with 62 additions and 96 deletions
--- a/meson.build
+++ b/meson.build
@@ -2561,11 +2561,13 @@ foreach dict : executables
                continue
        endif

+        exe_sources = dict.get('sources', []) + dict.get('extract', [])
+
        kwargs = {}
        foreach key, val : dict
                if key in ['name', 'dbus', 'public', 'conditions',
                           'type', 'suite', 'timeout', 'parallel',
-                           'objects', 'extract']
+                           'objects', 'sources', 'extract']
                        continue
                endif

@@ -2596,12 +2598,17 @@ foreach dict : executables

        if is_fuzz
                foreach key, val : fuzz_additional_kwargs
-                        kwargs += { key : [ kwargs.get(key, []), val ] }
+                        if key == 'sources'
+                                exe_sources += val
+                        else
+                                kwargs += { key : [ kwargs.get(key, []), val ] }
+                        endif
                endforeach
        endif

        exe = executable(
                name,
+                sources : exe_sources,
                kwargs : kwargs,
                implicit_include_directories : false,
        )
@@ -2609,7 +2616,7 @@ foreach dict : executables
        executables_by_name += { name : exe }

        if not name.endswith('.standalone')
-                sources += dict.get('sources', [])
+                sources += exe_sources
        endif

        if dict.has_key('extract')
--- a/src/analyze/meson.build
+++ b/src/analyze/meson.build
@@ -48,7 +48,7 @@ executables += [
        executable_template + {
                'name' : 'systemd-analyze',
                'public' : conf.get('ENABLE_ANALYZE') == 1,
-                'sources' : systemd_analyze_sources + systemd_analyze_extract_sources,
+                'sources' : systemd_analyze_sources,
                'extract' : systemd_analyze_extract_sources,
                'include_directories' : core_includes,
                'link_with' : [
--- a/src/busctl/meson.build
+++ b/src/busctl/meson.build
@@ -11,7 +11,7 @@ executables += [
        executable_template + {
                'name' : 'busctl',
                'public' : true,
-                'sources' : busctl_sources + busctl_extract_sources,
+                'sources' : busctl_sources,
                'extract' : busctl_extract_sources,
        },
        test_template + {
--- a/src/coredump/meson.build
+++ b/src/coredump/meson.build
@@ -36,7 +36,7 @@ common_dependencies = [
 executables += [
        libexec_template + {
                'name' : 'systemd-coredump',
-                'sources' : systemd_coredump_sources + systemd_coredump_extract_sources,
+                'sources' : systemd_coredump_sources,
                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                'extract' : systemd_coredump_extract_sources,
                'link_with' : [libshared],
--- a/src/hibernate-resume/meson.build
+++ b/src/hibernate-resume/meson.build
@@ -7,10 +7,7 @@ endif
 executables += [
        libexec_template + {
                'name' : 'systemd-hibernate-resume',
-                'sources' : files(
-                        'hibernate-resume.c',
-                        'hibernate-resume-config.c',
-                ),
+                'sources' : files('hibernate-resume.c'),
                'extract' : files('hibernate-resume-config.c'),
        },
        generator_template + {
--- a/src/home/meson.build
+++ b/src/home/meson.build
@@ -61,10 +61,10 @@ executables += [
        libexec_template + {
                'name' : 'systemd-homed',
                'dbus' : true,
-                'sources' : systemd_homed_sources + systemd_homed_extract_sources,
+                'sources' : systemd_homed_sources,
+                'extract' : systemd_homed_extract_sources,
                'include_directories' : includes +
                                        include_directories('.'),
-                'extract' : systemd_homed_extract_sources,
                'dependencies' : [
                        libcrypt,
                        libm,
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -50,7 +50,7 @@ executables += [
        libexec_template + {
                'name' : 'systemd-importd',
                'dbus' : true,
-                'sources' : systemd_importd_sources + systemd_importd_extract_sources,
+                'sources' : systemd_importd_sources,
                'extract' : systemd_importd_extract_sources,
                'dependencies' : [common_deps, threads],
        },
--- a/src/integritysetup/meson.build
+++ b/src/integritysetup/meson.build
@@ -7,10 +7,7 @@ endif
 executables += [
        libexec_template + {
                'name' : 'systemd-integritysetup',
-                'sources' : files(
-                        'integrity-util.c',
-                        'integritysetup.c',
-                ),
+                'sources' : files('integritysetup.c'),
                'extract' : files('integrity-util.c'),
                'dependencies' : libcryptsetup,
        },
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -39,7 +39,7 @@ executables += [
                        'ENABLE_REMOTE',
                        'HAVE_MICROHTTPD',
                ],
-                'sources' : systemd_journal_gatewayd_sources + systemd_journal_gatewayd_extract_sources,
+                'sources' : systemd_journal_gatewayd_sources,
                'extract' : systemd_journal_gatewayd_extract_sources,
                'dependencies' : common_deps + [libmicrohttpd],
        },
@@ -50,9 +50,9 @@ executables += [
                # fuzz-journal-remote even when --auto-features=disabled (see tools/oss-fuzz.sh for why).
                # 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 + systemd_journal_remote_extract_sources,
-                'objects' : conf.get('HAVE_MICROHTTPD') == 1 ? ['systemd-journal-gatewayd'] : [],
+                'sources' : systemd_journal_remote_sources,
                'extract' : systemd_journal_remote_extract_sources,
+                'objects' : conf.get('HAVE_MICROHTTPD') == 1 ? ['systemd-journal-gatewayd'] : [],
                'dependencies' : common_deps + [libmicrohttpd],
        },
        libexec_template + {
@@ -62,9 +62,9 @@ executables += [
                        'ENABLE_REMOTE',
                        'HAVE_LIBCURL',
                ],
-                'sources' : systemd_journal_upload_sources + systemd_journal_upload_extract_sources,
-                'objects' : ['systemd-journal-remote'],
+                'sources' : systemd_journal_upload_sources,
                'extract' : systemd_journal_upload_extract_sources,
+                'objects' : ['systemd-journal-remote'],
                'dependencies' : common_deps + [libcurl],
        },
        test_template + {
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -64,9 +64,9 @@ journal_fuzz_template = fuzz_template + {
 executables += [
        libexec_template + {
                'name' : 'systemd-journald',
-                'sources' : systemd_journald_sources + systemd_journald_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
+                'sources' : systemd_journald_sources,
                'extract' : systemd_journald_extract_sources,
+                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                'dependencies' : [
                        liblz4_cflags,
                        libselinux_cflags,
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -93,10 +93,7 @@ executables += [
                'sources' : files('test-lldp-rx.c'),
        },
        network_test_template + {
-                'sources' : files(
-                        'test-ndisc-ra.c',
-                        'icmp6-test-util.c',
-                ),
+                'sources' : files('test-ndisc-ra.c'),
                'extract' : files('icmp6-test-util.c'),
        },
        network_test_template + {
--- a/src/locale/meson.build
+++ b/src/locale/meson.build
@@ -29,7 +29,7 @@ executables += [
        libexec_template + {
                'name' : 'systemd-localed',
                'dbus' : true,
-                'sources' : systemd_localed_sources + systemd_localed_extract_sources,
+                'sources' : systemd_localed_sources,
                'extract' : systemd_localed_extract_sources,
                'dependencies' : libxkbcommon_deps,
        },
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -45,9 +45,9 @@ executables += [
        libexec_template + {
                'name' : 'systemd-logind',
                'dbus' : true,
-                'sources' : systemd_logind_sources + systemd_logind_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
+                'sources' : systemd_logind_sources,
                'extract' : systemd_logind_extract_sources,
+                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                'dependencies' : [
                        threads,
                ],
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -25,7 +25,7 @@ executables += [
        libexec_template + {
                'name' : 'systemd-machined',
                'dbus' : true,
-                'sources' : systemd_machined_sources + systemd_machined_extract_sources,
+                'sources' : systemd_machined_sources,
                'extract' : systemd_machined_extract_sources,
        },
        executable_template + {
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -198,7 +198,7 @@ executables += [
                'name' : 'systemd-networkd',
                'dbus' : true,
                'conditions' : ['ENABLE_NETWORKD'],
-                'sources' : systemd_networkd_sources + systemd_networkd_extract_sources,
+                'sources' : systemd_networkd_sources,
                'extract' : systemd_networkd_extract_sources,
                'include_directories' : network_includes,
                'link_with' : [
@@ -227,7 +227,7 @@ executables += [
        },
        libexec_template + {
                'name' : 'systemd-network-generator',
-                'sources' : files('generator/network-generator.c', 'generator/network-generator-main.c'),
+                'sources' : files('generator/network-generator-main.c'),
                'extract' : files('generator/network-generator.c'),
                'link_with' : networkd_link_with,
        },
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -40,12 +40,12 @@ executables += [
        executable_template + {
                'name' : 'systemd-nspawn',
                'public' : true,
-                'sources' : nspawn_sources + nspawn_extract_sources,
+                'sources' : nspawn_sources,
+                'extract' : nspawn_extract_sources,
                'include_directories' : [
                        executable_template['include_directories'],
                        include_directories('.')
                ],
-                'extract' : nspawn_extract_sources,
                'dependencies' : [
                        libseccomp_cflags,
                        libselinux_cflags,
--- a/src/nsresourced/meson.build
+++ b/src/nsresourced/meson.build
@@ -30,9 +30,9 @@ endif
 executables += [
        libexec_template + {
                'name' : 'systemd-nsresourced',
-                'sources' : systemd_nsresourced_sources + systemd_nsresourced_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
+                'sources' : systemd_nsresourced_sources,
                'extract' : systemd_nsresourced_extract_sources,
+                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                'dependencies' : threads,
        },
        libexec_template + {
--- a/src/oom/meson.build
+++ b/src/oom/meson.build
@@ -18,7 +18,7 @@ executables += [
        libexec_template + {
                'name' : 'systemd-oomd',
                'dbus' : true,
-                'sources' : systemd_oomd_sources + systemd_oomd_extract_sources,
+                'sources' : systemd_oomd_sources,
                'extract' : systemd_oomd_extract_sources,
                'dependencies' : libatomic,
        },
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -81,9 +81,9 @@ executables += [
        libexec_template + resolve_common_template + {
                'name' : 'systemd-resolved',
                'dbus' : true,
-                'sources' : systemd_resolved_sources + systemd_resolved_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
+                'sources' : systemd_resolved_sources,
                'extract' : systemd_resolved_extract_sources,
+                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
        },
        executable_template + resolve_common_template + {
                'name' : 'resolvectl',
--- a/src/shutdown/meson.build
+++ b/src/shutdown/meson.build
@@ -14,7 +14,7 @@ systemd_shutdown_extract_sources = files(
 executables += [
        libexec_template + {
                'name' : 'systemd-shutdown',
-                'sources' : systemd_shutdown_sources + systemd_shutdown_extract_sources,
+                'sources' : systemd_shutdown_sources,
                'extract' : systemd_shutdown_extract_sources,
                'dependencies' : libmount_cflags,
        },
--- a/src/sleep/meson.build
+++ b/src/sleep/meson.build
@@ -1,18 +1,11 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

-sleep_sources = files(
-        'sleep.c',
-)
-sleep_extract_sources = files(
-        'battery-capacity.c',
-)
-
 executables += [
        libexec_template + {
                'name' : 'systemd-sleep',
-                'sources' : sleep_sources + sleep_extract_sources,
+                'sources' : files('sleep.c'),
+                'extract' : files('battery-capacity.c'),
                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
-                'extract' : sleep_extract_sources,
        },
        test_template + {
                'sources' : files('test-battery-capacity.c'),
--- a/src/ssh-generator/meson.build
+++ b/src/ssh-generator/meson.build
@@ -3,25 +3,16 @@
 executables += [
        generator_template + {
                'name' : 'systemd-ssh-generator',
-                'sources' : files(
-                        'ssh-generator.c',
-                        'ssh-util.c',
-                ),
-                'extract' : files(
-                        'ssh-util.c',
-                ),
+                'sources' : files('ssh-generator.c'),
+                'extract' : files('ssh-util.c'),
        },
        libexec_template + {
                'name' : 'systemd-ssh-proxy',
-                'sources' : files(
-                        'ssh-proxy.c',
-                ),
+                'sources' : files('ssh-proxy.c'),
        },
        libexec_template + {
                'name' : 'systemd-ssh-issue',
-                'sources' : files(
-                        'ssh-issue.c',
-                ),
+                'sources' : files('ssh-issue.c'),
                'objects' : ['systemd-ssh-generator'],
        },
 ]
--- a/src/systemctl/meson.build
+++ b/src/systemctl/meson.build
@@ -52,7 +52,7 @@ executables += [
        executable_template + {
                'name' : 'systemctl',
                'public' : true,
-                'sources' : systemctl_sources + systemctl_extract_sources,
+                'sources' : systemctl_sources,
                'extract' : systemctl_extract_sources,
                'link_with' : systemctl_link_with,
                'dependencies' : [
--- a/src/sysupdate/meson.build
+++ b/src/sysupdate/meson.build
@@ -25,7 +25,7 @@ executables += [
                'name' : 'systemd-sysupdate',
                'public' : true,
                'conditions' : ['ENABLE_SYSUPDATE'],
-                'sources' : systemd_sysupdate_sources + systemd_sysupdate_extract_sources,
+                'sources' : systemd_sysupdate_sources,
                'extract' : systemd_sysupdate_extract_sources,
                'link_with' : [
                        libshared,
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

-awkscript = 'test-hashmap-ordered.awk'
 test_hashmap_ordered_c = custom_target(
-        input : [awkscript, 'test-hashmap-plain.c'],
+        input : ['test-hashmap-ordered.awk', 'test-hashmap-plain.c'],
        output : 'test-hashmap-ordered.c',
        command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
        capture : true,
@@ -382,10 +381,7 @@ executables += [
                'type' : 'manual',
        },
        test_template + {
-                'sources' : files(
-                        'test-nss-hosts.c',
-                        'nss-test-util.c',
-                ),
+                'sources' : files('test-nss-hosts.c'),
                'extract' : files('nss-test-util.c'),
                'dependencies' : [
                        libdl,
@@ -490,13 +486,13 @@ executables += [
        # Symbol tests
        test_template + {
                'name' : 'test-libsystemd-sym',
-                'sources' : test_libsystemd_sym_c,
+                'sources' : [test_libsystemd_sym_c],
                'link_with' : libsystemd,
                'suite' : 'libsystemd',
        },
        test_template + {
                'name' : 'test-libudev-sym',
-                'sources' : test_libudev_sym_c,
+                'sources' : [test_libudev_sym_c],
                'include_directories' : libudev_includes,
                'c_args' : ['-Wno-deprecated-declarations'] + test_cflags,
                'link_with' : libudev,
@@ -654,7 +650,7 @@ if static_libsystemd != 'false'
        executables += [
                test_template + {
                        'name' : 'test-libsystemd-static-sym',
-                        'sources' : test_libsystemd_sym_c,
+                        'sources' : [test_libsystemd_sym_c],
                        'link_with' : install_libsystemd_static,
                        'build_by_default' : want_tests != 'false',
                        'install' : install_tests,
@@ -667,7 +663,7 @@ if static_libudev != 'false'
        executables += [
                test_template + {
                        'name' : 'test-libudev-static-sym',
-                        'sources' : test_libudev_sym_c,
+                        'sources' : [test_libudev_sym_c],
                        'include_directories' : libudev_includes,
                        'c_args' : ['-Wno-deprecated-declarations'] + test_cflags,
                        'link_with' : install_libudev_static,
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -32,9 +32,9 @@ endif
 executables += [
        libexec_template + {
                'name' : 'systemd-timesyncd',
-                'sources' : timesyncd_sources + timesyncd_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
+                'sources' : timesyncd_sources,
                'extract' : timesyncd_extract_sources,
+                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                'link_with' : timesyncd_link_with,
                'dependencies' : [
                        libm,
--- a/src/tmpfiles/meson.build
+++ b/src/tmpfiles/meson.build
@@ -15,7 +15,7 @@ executables += [
        executable_template + {
                'name' : 'systemd-tmpfiles',
                'public' : true,
-                'sources' : systemd_tmpfiles_sources + systemd_tmpfiles_extract_sources,
+                'sources' : systemd_tmpfiles_sources,
                'extract' : systemd_tmpfiles_extract_sources,
                'dependencies' : libacl_cflags,
        },
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -144,8 +144,8 @@ udev_binaries_dict = [
                'name' : 'udevadm',
                'public' : true,
                'sources' : udevadm_sources +
-                            udevadm_extract_sources +
                            keyboard_keys_from_name_inc,
+                'extract' : udevadm_extract_sources,
                'include_directories' : [
                        libexec_template['include_directories'],
                        include_directories('.', 'net'),
@@ -154,7 +154,6 @@ udev_binaries_dict = [
                'link_with' : udev_link_with,
                'install_rpath' : udev_rpath,
                'install_tag' : 'udev',
-                'extract' : udevadm_extract_sources,
        },
        udev_plugin_template + {
                'name' : 'ata_id',
@@ -171,10 +170,7 @@ udev_binaries_dict = [
        },
        udev_plugin_template + {
                'name' : 'fido_id',
-                'sources' : files(
-                        'fido_id/fido_id.c',
-                        'fido_id/fido_id_desc.c',
-                ),
+                'sources' : files('fido_id/fido_id.c'),
                'extract' : files('fido_id/fido_id_desc.c'),
        },
        udev_plugin_template + {
--- a/src/vmspawn/meson.build
+++ b/src/vmspawn/meson.build
@@ -19,7 +19,7 @@ executables += [
        executable_template + {
                'name' : 'systemd-vmspawn',
                'public' : true,
-                'sources' : vmspawn_sources + vmspawn_extract_sources,
+                'sources' : vmspawn_sources,
                'extract' : vmspawn_extract_sources,
        },
        test_template + {
--- a/src/xdg-autostart-generator/meson.build
+++ b/src/xdg-autostart-generator/meson.build
@@ -4,19 +4,11 @@ if conf.get('ENABLE_XDG_AUTOSTART') != 1
        subdir_done()
 endif

-systemd_xdg_autostart_generator_sources = files(
-        'xdg-autostart-generator.c',
-)
-systemd_xdg_autostart_generator_extract_sources = files(
-        'xdg-autostart-service.c',
-)
-
 executables += [
        executable_template + {
                'name' : 'systemd-xdg-autostart-generator',
-                'sources' : systemd_xdg_autostart_generator_sources +
-                            systemd_xdg_autostart_generator_extract_sources,
-                'extract' : systemd_xdg_autostart_generator_extract_sources,
+                'sources' : files('xdg-autostart-generator.c'),
+                'extract' : files('xdg-autostart-service.c'),
                'install_dir' : usergeneratordir,
        },
        libexec_template + {