diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-02 14:49:32 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-02 14:49:32 +0100 |
| commit | f1b98127ff6320648cc3dc876f3b6a5aa3af204b (patch) | |
| tree | 0fcea4eff1ccda78d54edab923f1444f74a3ff2f | |
| parent | 82e4b0305b789f1765f7d3ad74ff6730424c9f74 (diff) | |
| download | systemd-f1b98127ff6320648cc3dc876f3b6a5aa3af204b.tar.gz | |
meson: do not use split() in file lists
The approach to use '''…'''.split() instead of a list of strings was initially
used when converting from automake because it allowed identical blocks of lines
to be used for both, making the conversion easier.
But over the years we have been using normal lists more and more, especially
when there were just a few filenames listed. This converts the rest.
No functional change.
| -rw-r--r-- | catalog/meson.build | 27 | ||||
| -rw-r--r-- | hwdb.d/meson.build | 62 | ||||
| -rw-r--r-- | rules.d/meson.build | 49 | ||||
| -rw-r--r-- | src/analyze/meson.build | 101 | ||||
| -rw-r--r-- | src/basic/meson.build | 515 | ||||
| -rw-r--r-- | src/coredump/meson.build | 9 | ||||
| -rw-r--r-- | src/home/meson.build | 142 | ||||
| -rw-r--r-- | src/journal-remote/meson.build | 37 | ||||
| -rw-r--r-- | src/journal/meson.build | 58 | ||||
| -rw-r--r-- | src/libsystemd-network/meson.build | 93 | ||||
| -rw-r--r-- | src/libsystemd/meson.build | 176 | ||||
| -rw-r--r-- | src/locale/meson.build | 9 | ||||
| -rw-r--r-- | src/login/meson.build | 83 | ||||
| -rw-r--r-- | src/machine/meson.build | 34 | ||||
| -rw-r--r-- | src/network/meson.build | 405 | ||||
| -rw-r--r-- | src/nspawn/meson.build | 59 | ||||
| -rw-r--r-- | src/oom/meson.build | 21 | ||||
| -rw-r--r-- | src/partition/meson.build | 4 | ||||
| -rw-r--r-- | src/portable/meson.build | 25 | ||||
| -rw-r--r-- | src/pstore/meson.build | 4 | ||||
| -rw-r--r-- | src/resolve/meson.build | 149 | ||||
| -rw-r--r-- | src/shared/meson.build | 690 | ||||
| -rw-r--r-- | src/shutdown/meson.build | 9 | ||||
| -rw-r--r-- | src/sysext/meson.build | 4 | ||||
| -rw-r--r-- | src/systemd/meson.build | 66 | ||||
| -rw-r--r-- | src/udev/meson.build | 82 | ||||
| -rw-r--r-- | src/userdb/meson.build | 17 |
27 files changed, 1434 insertions, 1496 deletions
diff --git a/catalog/meson.build b/catalog/meson.build index a20189d314..6a0a2193a2 100644 --- a/catalog/meson.build +++ b/catalog/meson.build @@ -1,19 +1,18 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -in_files = ''' - systemd.bg.catalog - systemd.be.catalog - systemd.be@latin.catalog - systemd.de.catalog - systemd.fr.catalog - systemd.it.catalog - systemd.pl.catalog - systemd.pt_BR.catalog - systemd.ru.catalog - systemd.zh_CN.catalog - systemd.zh_TW.catalog - systemd.catalog -'''.split() +in_files = [ + 'systemd.bg.catalog', + 'systemd.be.catalog', + 'systemd.be@latin.catalog', + 'systemd.de.catalog', + 'systemd.fr.catalog', + 'systemd.it.catalog', + 'systemd.pl.catalog', + 'systemd.pt_BR.catalog', + 'systemd.ru.catalog', + 'systemd.zh_CN.catalog', + 'systemd.zh_TW.catalog', + 'systemd.catalog'] support_url = get_option('support-url') support_sed = 's~%SUPPORT_URL%~@0@~'.format(support_url) diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build index fc72ebb2bd..21079d077a 100644 --- a/hwdb.d/meson.build +++ b/hwdb.d/meson.build @@ -3,39 +3,37 @@ # Those files right now are not supported by the grammar. Also, # they are very long but quite repetitive and the parser is not very fast. # So we don't "test" them. -hwdb_files_notest = files(''' - README - 20-dmi-id.hwdb - 20-pci-vendor-model.hwdb - 20-pci-classes.hwdb - 20-usb-vendor-model.hwdb - 20-usb-classes.hwdb - 20-sdio-vendor-model.hwdb - 20-sdio-classes.hwdb - 20-bluetooth-vendor-product.hwdb - 20-acpi-vendor.hwdb - 20-OUI.hwdb - 20-net-ifname.hwdb - 20-vmbus-class.hwdb -'''.split()) +hwdb_files_notest = files( + 'README', + '20-dmi-id.hwdb', + '20-pci-vendor-model.hwdb', + '20-pci-classes.hwdb', + '20-usb-vendor-model.hwdb', + '20-usb-classes.hwdb', + '20-sdio-vendor-model.hwdb', + '20-sdio-classes.hwdb', + '20-bluetooth-vendor-product.hwdb', + '20-acpi-vendor.hwdb', + '20-OUI.hwdb', + '20-net-ifname.hwdb', + '20-vmbus-class.hwdb') -hwdb_files_test = files(''' - 60-autosuspend.hwdb - 60-autosuspend-fingerprint-reader.hwdb - 60-evdev.hwdb - 60-input-id.hwdb - 60-keyboard.hwdb - 60-seat.hwdb - 60-sensor.hwdb - 70-analyzers.hwdb - 70-cameras.hwdb - 70-joystick.hwdb - 70-mouse.hwdb - 70-pda.hwdb - 70-pointingstick.hwdb - 70-touchpad.hwdb - 80-ieee1394-unit-function.hwdb -'''.split()) +hwdb_files_test = files( + '60-autosuspend.hwdb', + '60-autosuspend-fingerprint-reader.hwdb', + '60-evdev.hwdb', + '60-input-id.hwdb', + '60-keyboard.hwdb', + '60-seat.hwdb', + '60-sensor.hwdb', + '70-analyzers.hwdb', + '70-cameras.hwdb', + '70-joystick.hwdb', + '70-mouse.hwdb', + '70-pda.hwdb', + '70-pointingstick.hwdb', + '70-touchpad.hwdb', + '80-ieee1394-unit-function.hwdb') if conf.get('ENABLE_HWDB') == 1 auto_suspend_rules = custom_target( diff --git a/rules.d/meson.build b/rules.d/meson.build index 5cecddb34f..e6533e001a 100644 --- a/rules.d/meson.build +++ b/rules.d/meson.build @@ -4,31 +4,30 @@ install_data( 'README', install_dir : udevrulesdir) -rules = files(''' - 60-autosuspend.rules - 60-block.rules - 60-cdrom_id.rules - 60-drm.rules - 60-evdev.rules - 60-fido-id.rules - 60-input-id.rules - 60-persistent-alsa.rules - 60-persistent-input.rules - 60-persistent-storage.rules - 60-persistent-storage-tape.rules - 60-persistent-v4l.rules - 60-sensor.rules - 60-serial.rules - 70-camera.rules - 70-joystick.rules - 70-mouse.rules - 70-touchpad.rules - 75-net-description.rules - 75-probe_mtd.rules - 78-sound-card.rules - 80-net-setup-link.rules - 81-net-dhcp.rules -'''.split()) +rules = files( + '60-autosuspend.rules', + '60-block.rules', + '60-cdrom_id.rules', + '60-drm.rules', + '60-evdev.rules', + '60-fido-id.rules', + '60-input-id.rules', + '60-persistent-alsa.rules', + '60-persistent-input.rules', + '60-persistent-storage.rules', + '60-persistent-storage-tape.rules', + '60-persistent-v4l.rules', + '60-sensor.rules', + '60-serial.rules', + '70-camera.rules', + '70-joystick.rules', + '70-mouse.rules', + '70-touchpad.rules', + '75-net-description.rules', + '75-probe_mtd.rules', + '78-sound-card.rules', + '80-net-setup-link.rules', + '81-net-dhcp.rules') if conf.get('HAVE_KMOD') == 1 rules += files('80-drivers.rules') diff --git a/src/analyze/meson.build b/src/analyze/meson.build index 619f878e54..f0cfbb195e 100644 --- a/src/analyze/meson.build +++ b/src/analyze/meson.build @@ -1,56 +1,55 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_analyze_sources = files(''' - analyze-blame.c - analyze-blame.h - analyze-calendar.c - analyze-calendar.h - analyze-capability.c - analyze-capability.h - analyze-cat-config.c - analyze-cat-config.h - analyze-condition.c - analyze-condition.h - analyze-critical-chain.c - analyze-critical-chain.h - analyze-dot.c - analyze-dot.h - analyze-dump.c - analyze-dump.h - analyze-exit-status.c - analyze-exit-status.h - analyze-filesystems.c - analyze-filesystems.h - analyze-inspect-elf.c - analyze-inspect-elf.h - analyze-log-control.c - analyze-log-control.h - analyze-plot.c - analyze-plot.h - analyze-security.c - analyze-security.h - analyze-service-watchdogs.c - analyze-service-watchdogs.h - analyze-syscall-filter.c - analyze-syscall-filter.h - analyze-time.c - analyze-time.h - analyze-time-data.c - analyze-time-data.h - analyze-timespan.c - analyze-timespan.h - analyze-timestamp.c - analyze-timestamp.h - analyze-unit-files.c - analyze-unit-files.h - analyze-unit-paths.c - analyze-unit-paths.h - analyze-verify.c - analyze-verify.h - analyze-verify-util.c - analyze-verify-util.h - analyze.c -'''.split()) +systemd_analyze_sources = files( + 'analyze-blame.c', + 'analyze-blame.h', + 'analyze-calendar.c', + 'analyze-calendar.h', + 'analyze-capability.c', + 'analyze-capability.h', + 'analyze-cat-config.c', + 'analyze-cat-config.h', + 'analyze-condition.c', + 'analyze-condition.h', + 'analyze-critical-chain.c', + 'analyze-critical-chain.h', + 'analyze-dot.c', + 'analyze-dot.h', + 'analyze-dump.c', + 'analyze-dump.h', + 'analyze-exit-status.c', + 'analyze-exit-status.h', + 'analyze-filesystems.c', + 'analyze-filesystems.h', + 'analyze-inspect-elf.c', + 'analyze-inspect-elf.h', + 'analyze-log-control.c', + 'analyze-log-control.h', + 'analyze-plot.c', + 'analyze-plot.h', + 'analyze-security.c', + 'analyze-security.h', + 'analyze-service-watchdogs.c', + 'analyze-service-watchdogs.h', + 'analyze-syscall-filter.c', + 'analyze-syscall-filter.h', + 'analyze-time.c', + 'analyze-time.h', + 'analyze-time-data.c', + 'analyze-time-data.h', + 'analyze-timespan.c', + 'analyze-timespan.h', + 'analyze-timestamp.c', + 'analyze-timestamp.h', + 'analyze-unit-files.c', + 'analyze-unit-files.h', + 'analyze-unit-paths.c', + 'analyze-unit-paths.h', + 'analyze-verify.c', + 'analyze-verify.h', + 'analyze-verify-util.c', + 'analyze-verify-util.h', + 'analyze.c') tests += [ [files('test-verify.c', diff --git a/src/basic/meson.build b/src/basic/meson.build index 5a9e13d741..92a4df2017 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -1,263 +1,262 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -basic_sources = files(''' - MurmurHash2.c - MurmurHash2.h - af-list.c - af-list.h - alloc-util.c - alloc-util.h - architecture.c - architecture.h - arphrd-util.c - arphrd-util.h - async.c - async.h - audit-util.c - audit-util.h - build.c - build.h - bus-label.c - bus-label.h - cap-list.c - cap-list.h - capability-util.c - capability-util.h - cgroup-util.c - cgroup-util.h - chase-symlinks.c - chase-symlinks.h - chattr-util.c - chattr-util.h - conf-files.c - conf-files.h - def.h - dirent-util.c - dirent-util.h - dns-def.h - efivars.c - efivars.h - env-file.c - env-file.h - env-util.c - env-util.h - errno-list.c - errno-list.h - errno-util.h - escape.c - escape.h - ether-addr-util.c - ether-addr-util.h - extract-word.c - extract-word.h - fd-util.c - fd-util.h - fileio.c - fileio.h - filesystems.c - filesystems.h - format-util.c - format-util.h - fs-util.c - fs-util.h - glob-util.c - glob-util.h - glyph-util.c - glyph-util.h - gunicode.c - gunicode.h - hash-funcs.c - hash-funcs.h - hashmap.c - hashmap.h - hexdecoct.c - hexdecoct.h - hmac.c - hmac.h - hostname-util.c - hostname-util.h - in-addr-util.c - in-addr-util.h - inotify-util.c - inotify-util.h - io-util.c - io-util.h - ioprio-util.c - ioprio-util.h - limits-util.c - limits-util.h - linux/btrfs.h - linux/btrfs_tree.h - linux/can/netlink.h - linux/can/vxcan.h - linux/cfm_bridge.h - linux/fib_rules.h - linux/fou.h - linux/genetlink.h - linux/hdlc/ioctl.h - linux/if.h - linux/if_addr.h - linux/if_bonding.h - linux/if_bridge.h - linux/if_ether.h - linux/if_link.h - linux/if_macsec.h - linux/if_tun.h - linux/if_tunnel.h - linux/in.h - linux/in6.h - linux/ipv6_route.h - linux/l2tp.h - linux/libc-compat.h - linux/mrp_bridge.h - linux/netdevice.h - linux/netfilter/nf_tables.h - linux/netfilter/nfnetlink.h - linux/netlink.h - linux/nexthop.h - linux/nl80211.h - linux/pkt_sched.h - linux/rtnetlink.h - linux/wireguard.h - list.h - locale-util.c - locale-util.h - log.c - log.h - login-util.c - login-util.h - macro.h - memfd-util.c - memfd-util.h - memory-util.c - memory-util.h - mempool.c - mempool.h - missing_audit.h - missing_capability.h - missing_drm.h - missing_fcntl.h - missing_fs.h - missing_input.h - missing_ioprio.h - missing_keyctl.h - missing_magic.h - missing_mman.h - missing_mount.h - missing_network.h - missing_prctl.h - missing_random.h - missing_resource.h - missing_sched.h - missing_securebits.h - missing_socket.h - missing_stat.h - missing_stdlib.h - missing_syscall.h - missing_timerfd.h - missing_type.h - mkdir.c - mkdir.h - mountpoint-util.c - mountpoint-util.h - namespace-util.c - namespace-util.h - nss-util.h - nulstr-util.c - nulstr-util.h - ordered-set.c - ordered-set.h - os-util.c - os-util.h - parse-util.c - parse-util.h - path-lookup.c - path-lookup.h - path-util.c - path-util.h - percent-util.c - percent-util.h - prioq.c - prioq.h - proc-cmdline.c - proc-cmdline.h - process-util.c - process-util.h - procfs-util.c - procfs-util.h - pthread-util.h - random-util.c - random-util.h - ratelimit.c - ratelimit.h - raw-clone.h - raw-reboot.h - recovery-key.c - recovery-key.h - recurse-dir.c - recurse-dir.h - replace-var.c - replace-var.h - rlimit-util.c - rlimit-util.h - set.h - sigbus.c - sigbus.h - signal-util.c - signal-util.h - siphash24.c - siphash24.h - socket-util.c - socket-util.h - sort-util.c - sort-util.h - sparse-endian.h - special.h - stat-util.c - stat-util.h - static-destruct.h - stdio-util.h - strbuf.c - strbuf.h - string-table.c - string-table.h - string-util.c - string-util.h - strv.c - strv.h - strxcpyx.c - strxcpyx.h - sync-util.c - sync-util.h - sysctl-util.c - sysctl-util.h - syslog-util.c - syslog-util.h - terminal-util.c - terminal-util.h - time-util.c - time-util.h - tmpfile-util.c - tmpfile-util.h - umask-util.h - unaligned.h - unit-def.c - unit-def.h - unit-file.c - unit-file.h - unit-name.c - unit-name.h - user-util.c - user-util.h - utf8.c - utf8.h - util.c - util.h - virt.c - virt.h - xattr-util.c - xattr-util.h -'''.split()) +basic_sources = files( + 'MurmurHash2.c', + 'MurmurHash2.h', + 'af-list.c', + 'af-list.h', + 'alloc-util.c', + 'alloc-util.h', + 'architecture.c', + 'architecture.h', + 'arphrd-util.c', + 'arphrd-util.h', + 'async.c', + 'async.h', + 'audit-util.c', + 'audit-util.h', + 'build.c', + 'build.h', + 'bus-label.c', + 'bus-label.h', + 'cap-list.c', + 'cap-list.h', + 'capability-util.c', + 'capability-util.h', + 'cgroup-util.c', + 'cgroup-util.h', + 'chase-symlinks.c', + 'chase-symlinks.h', + 'chattr-util.c', + 'chattr-util.h', + 'conf-files.c', + 'conf-files.h', + 'def.h', + 'dirent-util.c', + 'dirent-util.h', + 'dns-def.h', + 'efivars.c', + 'efivars.h', + 'env-file.c', + 'env-file.h', + 'env-util.c', + 'env-util.h', + 'errno-list.c', + 'errno-list.h', + 'errno-util.h', + 'escape.c', + 'escape.h', + 'ether-addr-util.c', + 'ether-addr-util.h', + 'extract-word.c', + 'extract-word.h', + 'fd-util.c', + 'fd-util.h', + 'fileio.c', + 'fileio.h', + 'filesystems.c', + 'filesystems.h', + 'format-util.c', + 'format-util.h', + 'fs-util.c', + 'fs-util.h', + 'glob-util.c', + 'glob-util.h', + 'glyph-util.c', + 'glyph-util.h', + 'gunicode.c', + 'gunicode.h', + 'hash-funcs.c', + 'hash-funcs.h', + 'hashmap.c', + 'hashmap.h', + 'hexdecoct.c', + 'hexdecoct.h', + 'hmac.c', + 'hmac.h', + 'hostname-util.c', + 'hostname-util.h', + 'in-addr-util.c', + 'in-addr-util.h', + 'inotify-util.c', + 'inotify-util.h', + 'io-util.c', + 'io-util.h', + 'ioprio-util.c', + 'ioprio-util.h', + 'limits-util.c', + 'limits-util.h', + 'linux/btrfs.h', + 'linux/btrfs_tree.h', + 'linux/can/netlink.h', + 'linux/can/vxcan.h', + 'linux/cfm_bridge.h', + 'linux/fib_rules.h', + 'linux/fou.h', + 'linux/genetlink.h', + 'linux/hdlc/ioctl.h', + 'linux/if.h', + 'linux/if_addr.h', + 'linux/if_bonding.h', + 'linux/if_bridge.h', + 'linux/if_ether.h', + 'linux/if_link.h', + 'linux/if_macsec.h', + 'linux/if_tun.h', + 'linux/if_tunnel.h', + 'linux/in.h', + 'linux/in6.h', + 'linux/ipv6_route.h', + 'linux/l2tp.h', + 'linux/libc-compat.h', + 'linux/mrp_bridge.h', + 'linux/netdevice.h', + 'linux/netfilter/nf_tables.h', + 'linux/netfilter/nfnetlink.h', + 'linux/netlink.h', + 'linux/nexthop.h', + 'linux/nl80211.h', + 'linux/pkt_sched.h', + 'linux/rtnetlink.h', + 'linux/wireguard.h', + 'list.h', + 'locale-util.c', + 'locale-util.h', + 'log.c', + 'log.h', + 'login-util.c', + 'login-util.h', + 'macro.h', + 'memfd-util.c', + 'memfd-util.h', + 'memory-util.c', + 'memory-util.h', + 'mempool.c', + 'mempool.h', + 'missing_audit.h', + 'missing_capability.h', + 'missing_drm.h', + 'missing_fcntl.h', + 'missing_fs.h', + 'missing_input.h', + 'missing_ioprio.h', + 'missing_keyctl.h', + 'missing_magic.h', + 'missing_mman.h', + 'missing_mount.h', + 'missing_network.h', + 'missing_prctl.h', + 'missing_random.h', + 'missing_resource.h', + 'missing_sched.h', + 'missing_securebits.h', + 'missing_socket.h', + 'missing_stat.h', + 'missing_stdlib.h', + 'missing_syscall.h', + 'missing_timerfd.h', + 'missing_type.h', + 'mkdir.c', + 'mkdir.h', + 'mountpoint-util.c', + 'mountpoint-util.h', + 'namespace-util.c', + 'namespace-util.h', + 'nss-util.h', + 'nulstr-util.c', + 'nulstr-util.h', + 'ordered-set.c', + 'ordered-set.h', + 'os-util.c', + 'os-util.h', + 'parse-util.c', + 'parse-util.h', + 'path-lookup.c', + 'path-lookup.h', + 'path-util.c', + 'path-util.h', + 'percent-util.c', + 'percent-util.h', + 'prioq.c', + 'prioq.h', + 'proc-cmdline.c', + 'proc-cmdline.h', + 'process-util.c', + 'process-util.h', + 'procfs-util.c', + 'procfs-util.h', + 'pthread-util.h', + 'random-util.c', + 'random-util.h', + 'ratelimit.c', + 'ratelimit.h', + 'raw-clone.h', + 'raw-reboot.h', + 'recovery-key.c', + 'recovery-key.h', + 'recurse-dir.c', + 'recurse-dir.h', + 'replace-var.c', + 'replace-var.h', + 'rlimit-util.c', + 'rlimit-util.h', + 'set.h', + 'sigbus.c', + 'sigbus.h', + 'signal-util.c', + 'signal-util.h', + 'siphash24.c', + 'siphash24.h', + 'socket-util.c', + 'socket-util.h', + 'sort-util.c', + 'sort-util.h', + 'sparse-endian.h', + 'special.h', + 'stat-util.c', + 'stat-util.h', + 'static-destruct.h', + 'stdio-util.h', + 'strbuf.c', + 'strbuf.h', + 'string-table.c', + 'string-table.h', + 'string-util.c', + 'string-util.h', + 'strv.c', + 'strv.h', + 'strxcpyx.c', + 'strxcpyx.h', + 'sync-util.c', + 'sync-util.h', + 'sysctl-util.c', + 'sysctl-util.h', + 'syslog-util.c', + 'syslog-util.h', + 'terminal-util.c', + 'terminal-util.h', + 'time-util.c', + 'time-util.h', + 'tmpfile-util.c', + 'tmpfile-util.h', + 'umask-util.h', + 'unaligned.h', + 'unit-def.c', + 'unit-def.h', + 'unit-file.c', + 'unit-file.h', + 'unit-name.c', + 'unit-name.h', + 'user-util.c', + 'user-util.h', + 'utf8.c', + 'utf8.h', + 'util.c', + 'util.h', + 'virt.c', + 'virt.h', + 'xattr-util.c', + 'xattr-util.h') missing_audit_h = files('missing_audit.h') missing_capability_h = files('missing_capability.h') diff --git a/src/coredump/meson.build b/src/coredump/meson.build index 49ea93965b..ff509f9e28 100644 --- a/src/coredump/meson.build +++ b/src/coredump/meson.build @@ -1,10 +1,9 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_coredump_sources = files(''' - coredump.c - coredump-vacuum.c - coredump-vacuum.h -'''.split()) +systemd_coredump_sources = files( + 'coredump.c', + 'coredump-vacuum.c', + 'coredump-vacuum.h') coredumpctl_sources = files('coredumpctl.c') diff --git a/src/home/meson.build b/src/home/meson.build index 439eabc9bf..2b48a1a161 100644 --- a/src/home/meson.build +++ b/src/home/meson.build @@ -2,30 +2,29 @@ home_includes = [includes, include_directories('.')] -systemd_homework_sources = files(''' - home-util.c - home-util.h - homework-cifs.c - homework-cifs.h - homework-directory.c - homework-directory.h - homework-fido2.h - homework-fscrypt.c - homework-fscrypt.h - homework-luks.c - homework-luks.h - homework-mount.c - homework-mount.h - homework-password-cache.c - homework-password-cache.h - homework-pkcs11.h - homework-quota.c - homework-quota.h - homework.c - homework.h - user-record-util.c - user-record-util.h -'''.split()) +systemd_homework_sources = files( + 'home-util.c', + 'home-util.h', + 'homework-cifs.c', + 'homework-cifs.h', + 'homework-directory.c', + 'homework-directory.h', + 'homework-fido2.h', + 'homework-fscrypt.c', + 'homework-fscrypt.h', + 'homework-luks.c', + 'homework-luks.h', + 'homework-mount.c', + 'homework-mount.h', + 'homework-password-cache.c', + 'homework-password-cache.h', + 'homework-pkcs11.h', + 'homework-quota.c', + 'homework-quota.h', + 'homework.c', + 'homework.h', + 'user-record-util.c', + 'user-record-util.h') if conf.get('HAVE_P11KIT') == 1 systemd_homework_sources += files('homework-pkcs11.c') @@ -34,33 +33,32 @@ if conf.get('HAVE_LIBFIDO2') == 1 systemd_homework_sources += files('homework-fido2.c') endif -systemd_homed_sources = files(''' - home-util.c - home-util.h - homed-bus.c - homed-bus.h - homed-conf.c - homed-conf.h - homed-home-bus.c - homed-home-bus.h - homed-home.c - homed-home.h - homed-manager-bus.c - homed-manager-bus.h - homed-manager.c - homed-manager.h - homed-operation.c - homed-operation.h - homed-varlink.c - homed-varlink.h - homed.c - user-record-pwquality.c - user-record-pwquality.h - user-record-sign.c - user-record-sign.h - user-record-util.c - user-record-util.h -'''.split()) +systemd_homed_sources = files( + 'home-util.c', + 'home-util.h', + 'homed-bus.c', + 'homed-bus.h', + 'homed-conf.c', + 'homed-conf.h', + 'homed-home-bus.c', + 'homed-home-bus.h', + 'homed-home.c', + 'homed-home.h', + 'homed-manager-bus.c', + 'homed-manager-bus.h', + 'homed-manager.c', + 'homed-manager.h', + 'homed-operation.c', + 'homed-operation.h', + 'homed-varlink.c', + 'homed-varlink.h', + 'homed.c', + 'user-record-pwquality.c', + 'user-record-pwquality.h', + 'user-record-sign.c', + 'user-record-sign.h', + 'user-record-util.c', + 'user-record-util.h') homed_gperf_c = custom_target( 'homed_gperf.c', @@ -70,30 +68,28 @@ homed_gperf_c = custom_target( systemd_homed_sources += [homed_gperf_c] -homectl_sources = files(''' - home-util.c - home-util.h - homectl-fido2.c - homectl-fido2.h - homectl-pkcs11.c - homectl-pkcs11.h - homectl-recovery-key.c - homectl-recovery-key.h - homectl.c - user-record-pwquality.c - user-record-pwquality.h - user-record-util.c - user-record-util.h -'''.split()) +homectl_sources = files( + 'home-util.c', + 'home-util.h', + 'homectl-fido2.c', + 'homectl-fido2.h', + 'homectl-pkcs11.c', + 'homectl-pkcs11.h', + 'homectl-recovery-key.c', + 'homectl-recovery-key.h', + 'homectl.c', + 'user-record-pwquality.c', + 'user-record-pwquality.h', + 'user-record-util.c', + 'user-record-util.h') pam_systemd_home_sym = 'src/home/pam_systemd_home.sym' -pam_systemd_home_c = files(''' - home-util.c - home-util.h - pam_systemd_home.c - user-record-util.c - user-record-util.h -'''.split()) +pam_systemd_home_c = files( + 'home-util.c', + 'home-util.h', + 'pam_systemd_home.c', + 'user-record-util.c', + 'user-record-util.h') if conf.get('ENABLE_HOMED') == 1 install_data('org.freedesktop.home1.conf', diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index 1f3e0878ae..5bd93904c5 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -1,19 +1,17 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_journal_upload_sources = files(''' - journal-upload.h - journal-upload.c - journal-upload-journal.c -'''.split()) +systemd_journal_upload_sources = files( + 'journal-upload.h', + 'journal-upload.c', + 'journal-upload-journal.c') -libsystemd_journal_remote_sources = files(''' - journal-remote-parse.h - journal-remote-parse.c - journal-remote-write.h - journal-remote-write.c - journal-remote.h - journal-remote.c -'''.split()) +libsystemd_journal_remote_sources = files( + 'journal-remote-parse.h', + 'journal-remote-parse.c', + 'journal-remote-write.h', + 'journal-remote-write.c', + 'journal-remote.h', + 'journal-remote.c') if conf.get('HAVE_MICROHTTPD') == 1 libsystemd_journal_remote_sources += files( @@ -33,15 +31,12 @@ libsystemd_journal_remote = static_library( liblz4], build_by_default : false) -systemd_journal_remote_sources = files(''' - journal-remote-main.c -'''.split()) +systemd_journal_remote_sources = files('journal-remote-main.c') -systemd_journal_gatewayd_sources = files(''' - journal-gatewayd.c - microhttpd-util.h - microhttpd-util.c -'''.split()) +systemd_journal_gatewayd_sources = files( + 'journal-gatewayd.c', + 'microhttpd-util.h', + 'microhttpd-util.c') in_files = [ ['journal-upload.conf', diff --git a/src/journal/meson.build b/src/journal/meson.build index ff9463f7c4..3bb375f69e 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -1,29 +1,28 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -sources = files(''' - journald-audit.c - journald-audit.h - journald-console.c - journald-console.h - journald-context.c - journald-context.h - journald-kmsg.c - journald-kmsg.h - journald-native.c - journald-native.h - journald-rate-limit.c - journald-rate-limit.h - journald-server.c - journald-server.h - journald-stream.c - journald-stream.h - journald-syslog.c - journald-syslog.h - journald-wall.c - journald-wall.h - managed-journal-file.c - managed-journal-file.h -'''.split()) +sources = files( + 'journald-audit.c', + 'journald-audit.h', + 'journald-console.c', + 'journald-console.h', + 'journald-context.c', + 'journald-context.h', + 'journald-kmsg.c', + 'journald-kmsg.h', + 'journald-native.c', + 'journald-native.h', + 'journald-rate-limit.c', + 'journald-rate-limit.h', + 'journald-server.c', + 'journald-server.h', + 'journald-stream.c', + 'journald-stream.h', + 'journald-syslog.c', + 'journald-syslog.h', + 'journald-wall.c', + 'journald-wall.h', + 'managed-journal-file.c', + 'managed-journal-file.h') sources += custom_target( 'journald-gperf.c', @@ -40,16 +39,13 @@ libjournal_core = static_library( journal_includes = [includes, include_directories('.')] -systemd_journald_sources = files(''' - journald.c - journald-server.h -'''.split()) +systemd_journald_sources = files( + 'journald.c', + 'journald-server.h') systemd_cat_sources = files('cat.c') -journalctl_sources = files(''' - journalctl.c -'''.split()) +journalctl_sources = files('journalctl.c') if install_sysconfdir_samples install_data('journald.conf', diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build index 63ac8165b7..b4407051ff 100644 --- a/src/libsystemd-network/meson.build +++ b/src/libsystemd-network/meson.build @@ -1,52 +1,51 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -sources = files(''' - arp-util.c - arp-util.h - dhcp-client-internal.h - dhcp-identifier.c - dhcp-identifier.h - dhcp-internal.h - dhcp-lease-internal.h - dhcp-network.c - dhcp-option.c - dhcp-packet.c - dhcp-protocol.h - dhcp-server-internal.h - dhcp6-internal.h - dhcp6-lease-internal.h - dhcp6-network.c - dhcp6-option.c - dhcp6-option.h - dhcp6-protocol.c - dhcp6-protocol.h - icmp6-util.c - icmp6-util.h - lldp-neighbor.c - lldp-neighbor.h - lldp-network.c - lldp-network.h - lldp-rx-internal.h - ndisc-internal.h - ndisc-router.c - ndisc-router.h - network-common.c - network-common.h - network-internal.c - network-internal.h - radv-internal.h - sd-dhcp-client.c - sd-dhcp-lease.c - sd-dhcp-server.c - sd-dhcp6-client.c - sd-dhcp6-lease.c - sd-ipv4acd.c - sd-ipv4ll.c - sd-lldp-rx.c - sd-lldp-tx.c - sd-ndisc.c - sd-radv.c -'''.split()) +sources = files( + 'arp-util.c', + 'arp-util.h', + 'dhcp-client-internal.h', + 'dhcp-identifier.c', + 'dhcp-identifier.h', + 'dhcp-internal.h', + 'dhcp-lease-internal.h', + 'dhcp-network.c', + 'dhcp-option.c', + 'dhcp-packet.c', + 'dhcp-protocol.h', + 'dhcp-server-internal.h', + 'dhcp6-internal.h', + 'dhcp6-lease-internal.h', + 'dhcp6-network.c', + 'dhcp6-option.c', + 'dhcp6-option.h', + 'dhcp6-protocol.c', + 'dhcp6-protocol.h', + 'icmp6-util.c', + 'icmp6-util.h', + 'lldp-neighbor.c', + 'lldp-neighbor.h', + 'lldp-network.c', + 'lldp-network.h', + 'lldp-rx-internal.h', + 'ndisc-internal.h', + 'ndisc-router.c', + 'ndisc-router.h', + 'network-common.c', + 'network-common.h', + 'network-internal.c', + 'network-internal.h', + 'radv-internal.h', + 'sd-dhcp-client.c', + 'sd-dhcp-lease.c', + 'sd-dhcp-server.c', + 'sd-dhcp6-client.c', + 'sd-dhcp6-lease.c', + 'sd-ipv4acd.c', + 'sd-ipv4ll.c', + 'sd-lldp-rx.c', + 'sd-lldp-tx.c', + 'sd-ndisc.c', + 'sd-radv.c') libsystemd_network = static_library( 'systemd-network', diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index efd22207ac..612f5226b0 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -56,11 +56,10 @@ sd_journal_sources += [audit_type_to_name] ############################################################ -id128_sources = files(''' - sd-id128/id128-util.c - sd-id128/id128-util.h - sd-id128/sd-id128.c -'''.split()) +id128_sources = files( + 'sd-id128/id128-util.c', + 'sd-id128/id128-util.h', + 'sd-id128/sd-id128.c') ############################################################ @@ -68,12 +67,11 @@ sd_daemon_sources = files('sd-daemon/sd-daemon.c') ############################################################ -sd_event_sources = files(''' - sd-event/event-source.h - sd-event/event-util.c - sd-event/event-util.h - sd-event/sd-event.c -'''.split()) +sd_event_sources = files( + 'sd-event/event-source.h', + 'sd-event/event-util.c', + 'sd-event/event-util.h', + 'sd-event/sd-event.c') ############################################################ @@ -81,84 +79,84 @@ sd_login_sources = files('sd-login/sd-login.c') ############################################################ -libsystemd_sources = files(''' - sd-bus/bus-common-errors.c - sd-bus/bus-common-errors.h - sd-bus/bus-container.c - sd-bus/bus-container.h - sd-bus/bus-control.c - sd-bus/bus-control.h - sd-bus/bus-convenience.c - sd-bus/bus-creds.c - sd-bus/bus-creds.h - sd-bus/bus-dump.c - sd-bus/bus-dump.h - sd-bus/bus-error.c - sd-bus/bus-error.h - sd-bus/bus-gvariant.c - sd-bus/bus-gvariant.h - sd-bus/bus-internal.c - sd-bus/bus-internal.h - sd-bus/bus-introspect.c - sd-bus/bus-introspect.h - sd-bus/bus-kernel.c - sd-bus/bus-kernel.h - sd-bus/bus-match.c - sd-bus/bus-match.h - sd-bus/bus-message.c - sd-bus/bus-message.h - sd-bus/bus-objects.c - sd-bus/bus-objects.h - sd-bus/bus-protocol.h - sd-bus/bus-signature.c - sd-bus/bus-signature.h - sd-bus/bus-slot.c - sd-bus/bus-slot.h - sd-bus/bus-socket.c - sd-bus/bus-socket.h - sd-bus/bus-track.c - sd-bus/bus-track.h - sd-bus/bus-type.c - sd-bus/bus-type.h - sd-bus/sd-bus.c - sd-device/device-enumerator-private.h - sd-device/device-enumerator.c - sd-device/device-internal.h - sd-device/device-monitor-private.h - sd-device/device-monitor.c - sd-device/device-private.c - sd-device/device-private.h - sd-device/device-util.c - sd-device/device-util.h - sd-device/sd-device.c - sd-hwdb/hwdb-internal.h - sd-hwdb/sd-hwdb.c - sd-netlink/netlink-genl.c - sd-netlink/netlink-genl.h - sd-netlink/netlink-internal.h - sd-netlink/netlink-message-nfnl.c - sd-netlink/netlink-message-rtnl.c - sd-netlink/netlink-message.c - sd-netlink/netlink-slot.c - sd-netlink/netlink-slot.h - sd-netlink/netlink-socket.c - sd-netlink/netlink-types-genl.c - sd-netlink/netlink-types-internal.h - sd-netlink/netlink-types-nfnl.c - sd-netlink/netlink-types-rtnl.c - sd-netlink/netlink-types.c - sd-netlink/netlink-types.h - sd-netlink/netlink-util.c - sd-netlink/netlink-util.h - sd-netlink/sd-netlink.c - sd-network/network-util.c - sd-network/network-util.h - sd-network/sd-network.c - sd-path/sd-path.c - sd-resolve/resolve-private.h - sd-resolve/sd-resolve.c - sd-utf8/sd-utf8.c -'''.split()) + sd_journal_sources + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources +libsystemd_sources = files( + 'sd-bus/bus-common-errors.c', + 'sd-bus/bus-common-errors.h', + 'sd-bus/bus-container.c', + 'sd-bus/bus-container.h', + 'sd-bus/bus-control.c', + 'sd-bus/bus-control.h', + 'sd-bus/bus-convenience.c', + 'sd-bus/bus-creds.c', + 'sd-bus/bus-creds.h', + 'sd-bus/bus-dump.c', + 'sd-bus/bus-dump.h', + 'sd-bus/bus-error.c', + 'sd-bus/bus-error.h', + 'sd-bus/bus-gvariant.c', + 'sd-bus/bus-gvariant.h', + 'sd-bus/bus-internal.c', + 'sd-bus/bus-internal.h', + 'sd-bus/bus-introspect.c', + 'sd-bus/bus-introspect.h', + 'sd-bus/bus-kernel.c', + 'sd-bus/bus-kernel.h', + 'sd-bus/bus-match.c', + 'sd-bus/bus-match.h', + 'sd-bus/bus-message.c', + 'sd-bus/bus-message.h', + 'sd-bus/bus-objects.c', + 'sd-bus/bus-objects.h', + 'sd-bus/bus-protocol.h', + 'sd-bus/bus-signature.c', + 'sd-bus/bus-signature.h', + 'sd-bus/bus-slot.c', + 'sd-bus/bus-slot.h', + 'sd-bus/bus-socket.c', + 'sd-bus/bus-socket.h', + 'sd-bus/bus-track.c', + 'sd-bus/bus-track.h', + 'sd-bus/bus-type.c', + 'sd-bus/bus-type.h', + 'sd-bus/sd-bus.c', + 'sd-device/device-enumerator-private.h', + 'sd-device/device-enumerator.c', + 'sd-device/device-internal.h', + 'sd-device/device-monitor-private.h', + 'sd-device/device-monitor.c', + 'sd-device/device-private.c', + 'sd-device/device-private.h', + 'sd-device/device-util.c', + 'sd-device/device-util.h', + 'sd-device/sd-device.c', + 'sd-hwdb/hwdb-internal.h', + 'sd-hwdb/sd-hwdb.c', + 'sd-netlink/netlink-genl.c', + 'sd-netlink/netlink-genl.h', + 'sd-netlink/netlink-internal.h', + 'sd-netlink/netlink-message-nfnl.c', + 'sd-netlink/netlink-message-rtnl.c', + 'sd-netlink/netlink-message.c', + 'sd-netlink/netlink-slot.c', + 'sd-netlink/netlink-slot.h', + 'sd-netlink/netlink-socket.c', + 'sd-netlink/netlink-types-genl.c', + 'sd-netlink/netlink-types-internal.h', + 'sd-netlink/netlink-types-nfnl.c', + 'sd-netlink/netlink-types-rtnl.c', + 'sd-netlink/netlink-types.c', + 'sd-netlink/netlink-types.h', + 'sd-netlink/netlink-util.c', + 'sd-netlink/netlink-util.h', + 'sd-netlink/sd-netlink.c', + 'sd-network/network-util.c', + 'sd-network/network-util.h', + 'sd-network/sd-network.c', + 'sd-path/sd-path.c', + 'sd-resolve/resolve-private.h', + 'sd-resolve/sd-resolve.c', + 'sd-utf8/sd-utf8.c', +) + sd_journal_sources + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources disable_mempool_c = files('disable-mempool.c') diff --git a/src/locale/meson.build b/src/locale/meson.build index 0ccf71583d..f55c8f4a3a 100644 --- a/src/locale/meson.build +++ b/src/locale/meson.build @@ -1,10 +1,9 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_localed_sources = files(''' - localed.c - keymap-util.c - keymap-util.h -'''.split()) +systemd_localed_sources = files( + 'localed.c', + 'keymap-util.c', + 'keymap-util.h') localectl_sources = files('localectl.c') diff --git a/src/login/meson.build b/src/login/meson.build index 92f491665c..000a5f9d96 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -1,9 +1,8 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_logind_sources = files(''' - logind.c - logind.h -'''.split()) +systemd_logind_sources = files( + 'logind.c', + 'logind.h') logind_gperf_c = custom_target( 'logind_gperf.c', @@ -11,38 +10,37 @@ logind_gperf_c = custom_target( output : 'logind-gperf.c', command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) -liblogind_core_sources = files(''' - logind-action.c - logind-action.h - logind-brightness.c - logind-brightness.h - logind-button.c - logind-button.h - logind-core.c - logind-dbus.c - logind-dbus.h - logind-device.c - logind-device.h - logind-inhibit.c - logind-inhibit.h - logind-polkit.c - logind-polkit.h - logind-seat-dbus.c - logind-seat-dbus.h - logind-seat.c - logind-seat.h - logind-session-dbus.c - logind-session-dbus.h - logind-session-device.c - logind-session-device.h - logind-session.c - logind-session.h - logind-user-dbus.c - logind-user-dbus.h - logind-user.c - logind-user.h - logind-utmp.c -'''.split()) +liblogind_core_sources = files( + 'logind-action.c', + 'logind-action.h', + 'logind-brightness.c', + 'logind-brightness.h', + 'logind-button.c', + 'logind-button.h', + 'logind-core.c', + 'logind-dbus.c', + 'logind-dbus.h', + 'logind-device.c', + 'logind-device.h', + 'logind-inhibit.c', + 'logind-inhibit.h', + 'logind-polkit.c', + 'logind-polkit.h', + 'logind-seat-dbus.c', + 'logind-seat-dbus.h', + 'logind-seat.c', + 'logind-seat.h', + 'logind-session-dbus.c', + 'logind-session-dbus.h', + 'logind-session-device.c', + 'logind-session-device.h', + 'logind-session.c', + 'logind-session.h', + 'logind-user-dbus.c', + 'logind-user-dbus.h', + 'logind-user.c', + 'logind-user.h', + 'logind-utmp.c') liblogind_core_sources += [logind_gperf_c] @@ -53,15 +51,12 @@ liblogind_core = static_library( dependencies : libacl, build_by_default : false) -loginctl_sources = files(''' - loginctl.c - sysfs-show.h - sysfs-show.c -'''.split()) +loginctl_sources = files( + 'loginctl.c', + 'sysfs-show.h', + 'sysfs-show.c') -user_runtime_dir_sources = files(''' - user-runtime-dir.c -'''.split()) +user_runtime_dir_sources = files('user-runtime-dir.c') pam_systemd_sym = 'src/login/pam_systemd.sym' pam_systemd_c = files('pam_systemd.c') diff --git a/src/machine/meson.build b/src/machine/meson.build index 87e4dde24c..1b7f11893f 100644 --- a/src/machine/meson.build +++ b/src/machine/meson.build @@ -1,24 +1,22 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_machined_sources = files(''' - machined.c - machined.h -'''.split()) +systemd_machined_sources = files( + 'machined.c', + 'machined.h') -libmachine_core_sources = files(''' - image-dbus.c - image-dbus.h - machine-dbus.c - machine-dbus.h - machine.c - machine.h - machined-core.c - machined-dbus.c - machined-varlink.c - machined-varlink.h - operation.c - operation.h -'''.split()) +libmachine_core_sources = files( + 'image-dbus.c', + 'image-dbus.h', + 'machine-dbus.c', + 'machine-dbus.h', + 'machine.c', + 'machine.h', + 'machined-core.c', + 'machined-dbus.c', + 'machined-varlink.c', + 'machined-varlink.h', + 'operation.c', + 'operation.h') libmachine_core = static_library( 'machine-core', diff --git a/src/network/meson.build b/src/network/meson.build index ca48acae91..ec8f58b046 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -1,215 +1,212 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -sources = files(''' - netdev/bareudp.c - netdev/bareudp.h - netdev/batadv.c - netdev/batadv.h - netdev/bond.c - netdev/bond.h - netdev/bridge.c - netdev/bridge.h - netdev/dummy.c - netdev/dummy.h - netdev/fou-tunnel.c - netdev/fou-tunnel.h - netdev/ifb.c - netdev/ifb.h - netdev/ipoib.c - netdev/ipoib.h - netdev/ipvlan.c - netdev/ipvlan.h - netdev/l2tp-tunnel.c - netdev/l2tp-tunnel.h - netdev/macsec.c - netdev/macsec.h - netdev/macvlan.c - netdev/macvlan.h - netdev/netdev-util.c - netdev/netdev-util.h - netdev/netdev.c - netdev/netdev.h - netdev/netdevsim.c - netdev/netdevsim.h - netdev/nlmon.c - netdev/nlmon.h - netdev/tunnel.c - netdev/tunnel.h - netdev/tuntap.c - netdev/tuntap.h - netdev/vcan.c - netdev/vcan.h - netdev/veth.c - netdev/veth.h - netdev/vlan.c - netdev/vlan.h - netdev/vrf.c - netdev/vrf.h - netdev/vxlan.c - netdev/vxlan.h - netdev/geneve.c - netdev/geneve.h - netdev/vxcan.c - netdev/vxcan.h - netdev/wireguard.c - netdev/wireguard.h - netdev/wlan.c - netdev/wlan.h - netdev/xfrm.c - netdev/xfrm.h - networkd-address-generation.c - networkd-address-generation.h - networkd-address-label.c - networkd-address-label.h - networkd-address-pool.c - networkd-address-pool.h - networkd-address.c - networkd-address.h - networkd-bridge-fdb.c - networkd-bridge-fdb.h - networkd-bridge-mdb.c - networkd-bridge-mdb.h - networkd-bridge-vlan.c - networkd-bridge-vlan.h - networkd-can.c - networkd-can.h - networkd-conf.c - networkd-conf.h - networkd-dhcp-common.c - networkd-dhcp-common.h - networkd-dhcp-prefix-delegation.c - networkd-dhcp-prefix-delegation.h - networkd-dhcp-server-bus.c - networkd-dhcp-server-bus.h - networkd-dhcp-server-static-lease.c - networkd-dhcp-server-static-lease.h - networkd-dhcp-server.c - networkd-dhcp-server.h - networkd-dhcp4.c - networkd-dhcp4.h - networkd-dhcp6.c - networkd-dhcp6.h - networkd-ipv4acd.c - networkd-ipv4acd.h - networkd-ipv4ll.c - networkd-ipv4ll.h - networkd-ipv6-proxy-ndp.c - networkd-ipv6-proxy-ndp.h - networkd-ipv6ll.c - networkd-ipv6ll.h - networkd-json.c - networkd-json.h - networkd-link-bus.c - networkd-link-bus.h - networkd-link.c - networkd-link.h - networkd-lldp-rx.c - networkd-lldp-rx.h - networkd-lldp-tx.c - networkd-lldp-tx.h - networkd-manager-bus.c - networkd-manager-bus.h - networkd-manager.c - networkd-manager.h - networkd-ndisc.c - networkd-ndisc.h - networkd-neighbor.c - networkd-neighbor.h - networkd-radv.c - networkd-radv.h - networkd-network-bus.c - networkd-network-bus.h - networkd-network.c - networkd-network.h - networkd-nexthop.c - networkd-nexthop.h - networkd-queue.c - networkd-queue.h - networkd-route-util.c - networkd-route-util.h - networkd-route.c - networkd-route.h - networkd-routing-policy-rule.c - networkd-routing-policy-rule.h - networkd-setlink.c - networkd-setlink.h - networkd-speed-meter.c - networkd-speed-meter.h - networkd-sriov.c - networkd-sriov.h - networkd-state-file.c - networkd-state-file.h - networkd-sysctl.c - networkd-sysctl.h - networkd-util.c - networkd-util.h - networkd-wifi.c - networkd-wifi.h - networkd-wiphy.c - networkd-wiphy.h - tc/cake.c - tc/cake.h - tc/codel.c - tc/codel.h - tc/drr.c - tc/drr.h - tc/ets.c - tc/ets.h - tc/fifo.c - tc/fifo.h - tc/fq.c - tc/fq.h - tc/fq-codel.c - tc/fq-codel.h - tc/fq-pie.c - tc/fq-pie.h - tc/gred.c - tc/gred.h - tc/hhf.c - tc/hhf.h - tc/htb.c - tc/htb.h - tc/netem.c - tc/netem.h - tc/pie.c - tc/pie.h - tc/qdisc.c - tc/qdisc.h - tc/qfq.c - tc/qfq.h - tc/sfb.c - tc/sfb.h - tc/sfq.c - tc/sfq.h - tc/tbf.c - tc/tbf.h - tc/tc-util.c - tc/tc-util.h - tc/tc.c - tc/tc.h - tc/tclass.c - tc/tclass.h - tc/teql.c - tc/teql.h -'''.split()) +sources = files( + 'netdev/bareudp.c', + 'netdev/bareudp.h', + 'netdev/batadv.c', + 'netdev/batadv.h', + 'netdev/bond.c', + 'netdev/bond.h', + 'netdev/bridge.c', + 'netdev/bridge.h', + 'netdev/dummy.c', + 'netdev/dummy.h', + 'netdev/fou-tunnel.c', + 'netdev/fou-tunnel.h', + 'netdev/ifb.c', + 'netdev/ifb.h', + 'netdev/ipoib.c', + 'netdev/ipoib.h', + 'netdev/ipvlan.c', + 'netdev/ipvlan.h', + 'netdev/l2tp-tunnel.c', + 'netdev/l2tp-tunnel.h', + 'netdev/macsec.c', + 'netdev/macsec.h', + 'netdev/macvlan.c', + 'netdev/macvlan.h', + 'netdev/netdev-util.c', + 'netdev/netdev-util.h', + 'netdev/netdev.c', + 'netdev/netdev.h', + 'netdev/netdevsim.c', + 'netdev/netdevsim.h', + 'netdev/nlmon.c', + 'netdev/nlmon.h', + 'netdev/tunnel.c', + 'netdev/tunnel.h', + 'netdev/tuntap.c', + 'netdev/tuntap.h', + 'netdev/vcan.c', + 'netdev/vcan.h', + 'netdev/veth.c', + 'netdev/veth.h', + 'netdev/vlan.c', + 'netdev/vlan.h', + 'netdev/vrf.c', + 'netdev/vrf.h', + 'netdev/vxlan.c', + 'netdev/vxlan.h', + 'netdev/geneve.c', + 'netdev/geneve.h', + 'netdev/vxcan.c', + 'netdev/vxcan.h', + 'netdev/wireguard.c', + 'netdev/wireguard.h', + 'netdev/wlan.c', + 'netdev/wlan.h', + 'netdev/xfrm.c', + 'netdev/xfrm.h', + 'networkd-address-generation.c', + 'networkd-address-generation.h', + 'networkd-address-label.c', + 'networkd-address-label.h', + 'networkd-address-pool.c', + 'networkd-address-pool.h', + 'networkd-address.c', + 'networkd-address.h', + 'networkd-bridge-fdb.c', + 'networkd-bridge-fdb.h', + 'networkd-bridge-mdb.c', + 'networkd-bridge-mdb.h', + 'networkd-bridge-vlan.c', + 'networkd-bridge-vlan.h', + 'networkd-can.c', + 'networkd-can.h', + 'networkd-conf.c', + 'networkd-conf.h', + 'networkd-dhcp-common.c', + 'networkd-dhcp-common.h', + 'networkd-dhcp-prefix-delegation.c', + 'networkd-dhcp-prefix-delegation.h', + 'networkd-dhcp-server-bus.c', + 'networkd-dhcp-server-bus.h', + 'networkd-dhcp-server-static-lease.c', + 'networkd-dhcp-server-static-lease.h', + 'networkd-dhcp-server.c', + 'networkd-dhcp-server.h', + 'networkd-dhcp4.c', + 'networkd-dhcp4.h', + 'networkd-dhcp6.c', + 'networkd-dhcp6.h', + 'networkd-ipv4acd.c', + 'networkd-ipv4acd.h', + 'networkd-ipv4ll.c', + 'networkd-ipv4ll.h', + 'networkd-ipv6-proxy-ndp.c', + 'networkd-ipv6-proxy-ndp.h', + 'networkd-ipv6ll.c', + 'networkd-ipv6ll.h', + 'networkd-json.c', + 'networkd-json.h', + 'networkd-link-bus.c', + 'networkd-link-bus.h', + 'networkd-link.c', + 'networkd-link.h', + 'networkd-lldp-rx.c', + 'networkd-lldp-rx.h', + 'networkd-lldp-tx.c', + 'networkd-lldp-tx.h', + 'networkd-manager-bus.c', + 'networkd-manager-bus.h', + 'networkd-manager.c', + 'networkd-manager.h', + 'networkd-ndisc.c', + 'networkd-ndisc.h', + 'networkd-neighbor.c', + 'networkd-neighbor.h', + 'networkd-radv.c', + 'networkd-radv.h', + 'networkd-network-bus.c', + 'networkd-network-bus.h', + 'networkd-network.c', + 'networkd-network.h', + 'networkd-nexthop.c', + 'networkd-nexthop.h', + 'networkd-queue.c', + 'networkd-queue.h', + 'networkd-route-util.c', + 'networkd-route-util.h', + 'networkd-route.c', + 'networkd-route.h', + 'networkd-routing-policy-rule.c', + 'networkd-routing-policy-rule.h', + 'networkd-setlink.c', + 'networkd-setlink.h', + 'networkd-speed-meter.c', + 'networkd-speed-meter.h', + 'networkd-sriov.c', + 'networkd-sriov.h', + 'networkd-state-file.c', + 'networkd-state-file.h', + 'networkd-sysctl.c', + 'networkd-sysctl.h', + 'networkd-util.c', + 'networkd-util.h', + 'networkd-wifi.c', + 'networkd-wifi.h', + 'networkd-wiphy.c', + 'networkd-wiphy.h', + 'tc/cake.c', + 'tc/cake.h', + 'tc/codel.c', + 'tc/codel.h', + 'tc/drr.c', + 'tc/drr.h', + 'tc/ets.c', + 'tc/ets.h', + 'tc/fifo.c', + 'tc/fifo.h', + 'tc/fq.c', + 'tc/fq.h', + 'tc/fq-codel.c', + 'tc/fq-codel.h', + 'tc/fq-pie.c', + 'tc/fq-pie.h', + 'tc/gred.c', + 'tc/gred.h', + 'tc/hhf.c', + 'tc/hhf.h', + 'tc/htb.c', + 'tc/htb.h', + 'tc/netem.c', + 'tc/netem.h', + 'tc/pie.c', + 'tc/pie.h', + 'tc/qdisc.c', + 'tc/qdisc.h', + 'tc/qfq.c', + 'tc/qfq.h', + 'tc/sfb.c', + 'tc/sfb.h', + 'tc/sfq.c', + 'tc/sfq.h', + 'tc/tbf.c', + 'tc/tbf.h', + 'tc/tc-util.c', + 'tc/tc-util.h', + 'tc/tc.c', + 'tc/tc.h', + 'tc/tclass.c', + 'tc/tclass.h', + 'tc/teql.c', + 'tc/teql.h') systemd_networkd_sources = files('networkd.c') -systemd_networkd_wait_online_sources = files(''' - wait-online/link.c - wait-online/link.h - wait-online/manager.c - wait-online/manager.h - wait-online/wait-online.c -'''.split()) +systemd_networkd_wait_online_sources = files( + 'wait-online/link.c', + 'wait-online/link.h', + 'wait-online/manager.c', + 'wait-online/manager.h', + 'wait-online/wait-online.c') networkctl_sources = files('networkctl.c') -network_generator_sources = files(''' - generator/main.c - generator/network-generator.c - generator/network-generator.h -'''.split()) +network_generator_sources = files( + 'generator/main.c', + 'generator/network-generator.c', + 'generator/network-generator.h') sources += custom_target( 'networkd-gperf.c', diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build index 2934672e9a..7a515accee 100644 --- a/src/nspawn/meson.build +++ b/src/nspawn/meson.build @@ -1,35 +1,34 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -libnspawn_core_sources = files(''' - nspawn-bind-user.c - nspawn-bind-user.h - nspawn-cgroup.c - nspawn-cgroup.h - nspawn-creds.c - nspawn-creds.h - nspawn-def.h - nspawn-expose-ports.c - nspawn-expose-ports.h - nspawn-mount.c - nspawn-mount.h - nspawn-network.c - nspawn-network.h - nspawn-oci.c - nspawn-oci.h - nspawn-patch-uid.c - nspawn-patch-uid.h - nspawn-register.c - nspawn-register.h - nspawn-seccomp.c - nspawn-seccomp.h - nspawn-settings.c - nspawn-settings.h - nspawn-setuid.c - nspawn-setuid.h - nspawn-stub-pid1.c - nspawn-stub-pid1.h - nspawn.h -'''.split()) +libnspawn_core_sources = files( + 'nspawn-bind-user.c', + 'nspawn-bind-user.h', + 'nspawn-cgroup.c', + 'nspawn-cgroup.h', + 'nspawn-creds.c', + 'nspawn-creds.h', + 'nspawn-def.h', + 'nspawn-expose-ports.c', + 'nspawn-expose-ports.h', + 'nspawn-mount.c', + 'nspawn-mount.h', + 'nspawn-network.c', + 'nspawn-network.h', + 'nspawn-oci.c', + 'nspawn-oci.h', + 'nspawn-patch-uid.c', + 'nspawn-patch-uid.h', + 'nspawn-register.c', + 'nspawn-register.h', + 'nspawn-seccomp.c', + 'nspawn-seccomp.h', + 'nspawn-settings.c', + 'nspawn-settings.h', + 'nspawn-setuid.c', + 'nspawn-setuid.h', + 'nspawn-stub-pid1.c', + 'nspawn-stub-pid1.h', + 'nspawn.h') nspawn_gperf_c = custom_target( 'nspawn-gperf.c', diff --git a/src/oom/meson.build b/src/oom/meson.build index da00cbf99e..f865ed26cf 100644 --- a/src/oom/meson.build +++ b/src/oom/meson.build @@ -1,18 +1,15 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_oomd_sources = files(''' - oomd-manager-bus.c - oomd-manager-bus.h - oomd-manager.c - oomd-manager.h - oomd-util.c - oomd-util.h - oomd.c -'''.split()) +systemd_oomd_sources = files( + 'oomd-manager-bus.c', + 'oomd-manager-bus.h', + 'oomd-manager.c', + 'oomd-manager.h', + 'oomd-util.c', + 'oomd-util.h', + 'oomd.c') -oomctl_sources = files(''' - oomctl.c -'''.split()) +oomctl_sources = files('oomctl.c') if conf.get('ENABLE_OOMD') == 1 install_data('org.freedesktop.oom1.conf', diff --git a/src/partition/meson.build b/src/partition/meson.build index d2729daba4..5422fdd575 100644 --- a/src/partition/meson.build +++ b/src/partition/meson.build @@ -1,7 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_repart_sources = files(''' - repart.c -'''.split()) +systemd_repart_sources = files('repart.c') test_repart_sh = find_program('test-repart.sh') diff --git a/src/portable/meson.build b/src/portable/meson.build index de82f5bff7..65ba74bc6f 100644 --- a/src/portable/meson.build +++ b/src/portable/meson.build @@ -1,18 +1,17 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_portabled_sources = files(''' - portable.c - portable.h - portabled-bus.c - portabled-image-bus.c - portabled-image-bus.h - portabled-image.c - portabled-image.h - portabled-operation.c - portabled-operation.h - portabled.c - portabled.h -'''.split()) +systemd_portabled_sources = files( + 'portable.c', + 'portable.h', + 'portabled-bus.c', + 'portabled-image-bus.c', + 'portabled-image-bus.h', + 'portabled-image.c', + 'portabled-image.h', + 'portabled-operation.c', + 'portabled-operation.h', + 'portabled.c', + 'portabled.h') if conf.get('ENABLE_PORTABLED') == 1 install_data('org.freedesktop.portable1.conf', diff --git a/src/pstore/meson.build b/src/pstore/meson.build index 8e01af751c..76b656a4b8 100644 --- a/src/pstore/meson.build +++ b/src/pstore/meson.build @@ -1,8 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_pstore_sources = files(''' - pstore.c -'''.split()) +systemd_pstore_sources = files('pstore.c') if conf.get('ENABLE_PSTORE') == 1 and install_sysconfdir_samples install_data('pstore.conf', diff --git a/src/resolve/meson.build b/src/resolve/meson.build index 24f94f8c0e..6478b8d589 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -2,82 +2,79 @@ resolve_includes = [includes, include_directories('.')] -basic_dns_sources = files(''' - resolved-dns-dnssec.c - resolved-dns-dnssec.h - resolved-dns-packet.c - resolved-dns-packet.h - resolved-dns-rr.c - resolved-dns-rr.h - resolved-dns-answer.c - resolved-dns-answer.h - resolved-dns-question.c - resolved-dns-question.h - resolved-util.c - resolved-util.h - dns-type.c - dns-type.h -'''.split()) - -systemd_resolved_sources = files(''' - resolved-bus.c - resolved-bus.h - resolved-conf.c - resolved-conf.h - resolved-def.h - resolved-dns-cache.c - resolved-dns-cache.h - resolved-dns-query.c - resolved-dns-query.h - resolved-dns-scope.c - resolved-dns-scope.h - resolved-dns-search-domain.c - resolved-dns-search-domain.h - resolved-dns-server.c - resolved-dns-server.h - resolved-dns-stream.c - resolved-dns-stream.h - resolved-dns-stub.c - resolved-dns-stub.h - resolved-dns-synthesize.c - resolved-dns-synthesize.h - resolved-dns-transaction.c - resolved-dns-transaction.h - resolved-dns-trust-anchor.c - resolved-dns-trust-anchor.h - resolved-dns-zone.c - resolved-dns-zone.h - resolved-dnssd-bus.c - resolved-dnssd-bus.h - resolved-dnssd.c - resolved-dnssd.h - resolved-dnstls.h - resolved-etc-hosts.c - resolved-etc-hosts.h - resolved-link-bus.c - resolved-link-bus.h - resolved-link.c - resolved-link.h - resolved-llmnr.c - resolved-llmnr.h - resolved-manager.c - resolved-manager.h - resolved-mdns.c - resolved-mdns.h - resolved-resolv-conf.c - resolved-resolv-conf.h - resolved-socket-graveyard.c - resolved-socket-graveyard.h - resolved-varlink.c - resolved-varlink.h -'''.split()) - -resolvectl_sources = files(''' - resolvconf-compat.c - resolvconf-compat.h - resolvectl.c - resolvectl.h -'''.split()) +basic_dns_sources = files( + 'resolved-dns-dnssec.c', + 'resolved-dns-dnssec.h', + 'resolved-dns-packet.c', + 'resolved-dns-packet.h', + 'resolved-dns-rr.c', + 'resolved-dns-rr.h', + 'resolved-dns-answer.c', + 'resolved-dns-answer.h', + 'resolved-dns-question.c', + 'resolved-dns-question.h', + 'resolved-util.c', + 'resolved-util.h', + 'dns-type.c', + 'dns-type.h') + +systemd_resolved_sources = files( + 'resolved-bus.c', + 'resolved-bus.h', + 'resolved-conf.c', + 'resolved-conf.h', + 'resolved-def.h', + 'resolved-dns-cache.c', + 'resolved-dns-cache.h', + 'resolved-dns-query.c', + 'resolved-dns-query.h', + 'resolved-dns-scope.c', + 'resolved-dns-scope.h', + 'resolved-dns-search-domain.c', + 'resolved-dns-search-domain.h', + 'resolved-dns-server.c', + 'resolved-dns-server.h', + 'resolved-dns-stream.c', + 'resolved-dns-stream.h', + 'resolved-dns-stub.c', + 'resolved-dns-stub.h', + 'resolved-dns-synthesize.c', + 'resolved-dns-synthesize.h', + 'resolved-dns-transaction.c', + 'resolved-dns-transaction.h', + 'resolved-dns-trust-anchor.c', + 'resolved-dns-trust-anchor.h', + 'resolved-dns-zone.c', + 'resolved-dns-zone.h', + 'resolved-dnssd-bus.c', + 'resolved-dnssd-bus.h', + 'resolved-dnssd.c', + 'resolved-dnssd.h', + 'resolved-dnstls.h', + 'resolved-etc-hosts.c', + 'resolved-etc-hosts.h', + 'resolved-link-bus.c', + 'resolved-link-bus.h', + 'resolved-link.c', + 'resolved-link.h', + 'resolved-llmnr.c', + 'resolved-llmnr.h', + 'resolved-manager.c', + 'resolved-manager.h', + 'resolved-mdns.c', + 'resolved-mdns.h', + 'resolved-resolv-conf.c', + 'resolved-resolv-conf.h', + 'resolved-socket-graveyard.c', + 'resolved-socket-graveyard.h', + 'resolved-varlink.c', + 'resolved-varlink.h') + +resolvectl_sources = files( + 'resolvconf-compat.c', + 'resolvconf-compat.h', + 'resolvectl.c', + 'resolvectl.h') ############################################################ diff --git a/src/shared/meson.build b/src/shared/meson.build index dfa025deec..7a01236363 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -1,346 +1,344 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -shared_sources = files(''' - acl-util.h - acpi-fpdt.c - acpi-fpdt.h - apparmor-util.c - apparmor-util.h - ask-password-api.c - ask-password-api.h - barrier.c - barrier.h - base-filesystem.c - base-filesystem.h - binfmt-util.c - binfmt-util.h - bitmap.c - bitmap.h - blkid-util.h - blockdev-util.c - blockdev-util.h - bond-util.c - bond-util.h - boot-timestamps.c - boot-timestamps.h - bootspec.c - bootspec.h - bpf-dlopen.c - bpf-dlopen.h - bpf-program.c - bpf-program.h - bridge-util.c - bridge-util.h - btrfs-util.c - btrfs-util.h - bus-get-properties.c - bus-get-properties.h - bus-locator.c - bus-locator.h - bus-log-control-api.c - bus-log-control-api.h - bus-map-properties.c - bus-map-properties.h - bus-message-util.c - bus-message-util.h - bus-object.c - bus-object.h - bus-polkit.c - bus-polkit.h - bus-print-properties.c - bus-print-properties.h - bus-unit-procs.c - bus-unit-procs.h - bus-unit-util.c - bus-unit-util.h - bus-util.c - bus-util.h - bus-wait-for-jobs.c - bus-wait-for-jobs.h - bus-wait-for-units.c - bus-wait-for-units.h - calendarspec.c - calendarspec.h - cgroup-setup.c - cgroup-setup.h - cgroup-show.c - cgroup-show.h - chown-recursive.c - chown-recursive.h - clean-ipc.c - clean-ipc.h - clock-util.c - clock-util.h - condition.c - condition.h - conf-parser.c - conf-parser.h - copy.c - copy.h - coredump-util.c - coredump-util.h - cpu-set-util.c - cpu-set-util.h - creds-util.c - creds-util.h - cryptsetup-util.c - cryptsetup-util.h - daemon-util.h - data-fd-util.c - data-fd-util.h - dev-setup.c - dev-setup.h - device-nodes.c - device-nodes.h - devnode-acl.h - discover-image.c - discover-image.h - dissect-image.c - dissect-image.h - dlfcn-util.c - dlfcn-util.h - dm-util.c - dm-util.h - dns-domain.c - dns-domain.h - dropin.c - dropin.h - efi-loader.c - efi-loader.h - elf-util.c - elf-util.h - enable-mempool.c - env-file-label.c - env-file-label.h - ethtool-util.c - ethtool-util.h - exec-util.c - exec-util.h - exit-status.c - exit-status.h - extension-release.c - extension-release.h - fdisk-util.h - fdset.c - fdset.h - fileio-label.c - fileio-label.h - firewall-util-nft.c - firewall-util-private.h - firewall-util.c - firewall-util.h - format-table.c - format-table.h - fsck-util.h - fstab-util.c - fstab-util.h - generator.c - generator.h - geneve-util.c - geneve-util.h - gpt.c - gpt.h - group-record.c - group-record.h - hostname-setup.c - hostname-setup.h - hwdb-util.c - hwdb-util.h - id128-print.c - id128-print.h - idn-util.c - idn-util.h - ima-util.c - ima-util.h - import-util.c - import-util.h - in-addr-prefix-util.c - in-addr-prefix-util.h - initreq.h - install-file.c - install-file.h - install-printf.c - install-printf.h - install.c - install.h - ip-protocol-list.c - ip-protocol-list.h - ipvlan-util.c - ipvlan-util.h - journal-importer.c - journal-importer.h - journal-util.c - journal-util.h - json-internal.h - json.c - json.h - kbd-util.c - kbd-util.h - keyring-util.h - keyring-util.c - killall.c - killall.h - label.c - label.h - libcrypt-util.c - libcrypt-util.h - libfido2-util.c - libfido2-util.h - libmount-util.h - linux/auto_dev-ioctl.h - linux/bpf.h - linux/bpf_common.h - linux/bpf_insn.h - linux/dm-ioctl.h - linux/ethtool.h - local-addresses.c - local-addresses.h - lockfile-util.c - lockfile-util.h - log-link.h - logs-show.c - logs-show.h - loop-util.c - loop-util.h - loopback-setup.c - loopback-setup.h - machine-id-setup.c - machine-id-setup.h - machine-pool.c - machine-pool.h - macvlan-util.c - macvlan-util.h - main-func.h - mkdir-label.c - mkdir-label.h - mkfs-util.c - mkfs-util.h - module-util.h - mount-setup.c - mount-setup.h - mount-util.c - mount-util.h - net-condition.c - net-condition.h - netif-naming-scheme.c - netif-naming-scheme.h - netif-sriov.c - netif-sriov.h - netif-util.c - netif-util.h - nscd-flush.h - nsflags.c - nsflags.h - numa-util.c - numa-util.h - openssl-util.c - openssl-util.h - output-mode.c - output-mode.h - pager.c - pager.h - parse-argument.c - parse-argument.h - parse-socket-bind-item.c - parse-socket-bind-item.h - pcre2-dlopen.c - pcre2-dlopen.h - pe-header.h - pkcs11-util.c - pkcs11-util.h - pretty-print.c - pretty-print.h - psi-util.c - psi-util.h - ptyfwd.c - ptyfwd.h - pwquality-util.c - pwquality-util.h - qrcode-util.c - qrcode-util.h - quota-util.c - quota-util.h - reboot-util.c - reboot-util.h - resize-fs.c - resize-fs.h - resolve-util.c - resolve-util.h - rm-rf.c - rm-rf.h - seccomp-util.h - securebits-util.c - securebits-util.h - selinux-util.c - selinux-util.h - serialize.c - serialize.h - service-util.c - service-util.h - sleep-config.c - sleep-config.h - smack-util.c - smack-util.h - socket-label.c - socket-netlink.c - socket-netlink.h - spawn-ask-password-agent.c - spawn-ask-password-agent.h - spawn-polkit-agent.c - spawn-polkit-agent.h - specifier.c - specifier.h - switch-root.c - switch-root.h - tmpfile-util-label.c - tmpfile-util-label.h - tomoyo-util.c - tomoyo-util.h - tpm2-util.c - tpm2-util.h - udev-util.c - udev-util.h - uid-alloc-range.c - uid-alloc-range.h - uid-range.c - uid-range.h - user-record-nss.c - user-record-nss.h - user-record-show.c - user-record-show.h - user-record.c - user-record.h - userdb-dropin.c - userdb-dropin.h - userdb.c - userdb.h - utmp-wtmp.h - varlink.c - varlink.h - verb-log-control.c - verb-log-control.h - verbs.c - verbs.h - vlan-util.c - vlan-util.h - volatile-util.c - volatile-util.h - watchdog.c - watchdog.h - web-util.c - web-util.h - wifi-util.c - wifi-util.h - xml.c - xml.h -'''.split()) +shared_sources = files( + 'acl-util.h', + 'acpi-fpdt.c', + 'acpi-fpdt.h', + 'apparmor-util.c', + 'apparmor-util.h', + 'ask-password-api.c', + 'ask-password-api.h', + 'barrier.c', + 'barrier.h', + 'base-filesystem.c', + 'base-filesystem.h', + 'binfmt-util.c', + 'binfmt-util.h', + 'bitmap.c', + 'bitmap.h', + 'blkid-util.h', + 'blockdev-util.c', + 'blockdev-util.h', + 'bond-util.c', + 'bond-util.h', + 'boot-timestamps.c', + 'boot-timestamps.h', + 'bootspec.c', + 'bootspec.h', + 'bpf-dlopen.c', + 'bpf-dlopen.h', + 'bpf-program.c', + 'bpf-program.h', + 'bridge-util.c', + 'bridge-util.h', + 'btrfs-util.c', + 'btrfs-util.h', + 'bus-get-properties.c', + 'bus-get-properties.h', + 'bus-locator.c', + 'bus-locator.h', + 'bus-log-control-api.c', + 'bus-log-control-api.h', + 'bus-map-properties.c', + 'bus-map-properties.h', + 'bus-message-util.c', + 'bus-message-util.h', + 'bus-object.c', + 'bus-object.h', + 'bus-polkit.c', + 'bus-polkit.h', + 'bus-print-properties.c', + 'bus-print-properties.h', + 'bus-unit-procs.c', + 'bus-unit-procs.h', + 'bus-unit-util.c', + 'bus-unit-util.h', + 'bus-util.c', + 'bus-util.h', + 'bus-wait-for-jobs.c', + 'bus-wait-for-jobs.h', + 'bus-wait-for-units.c', + 'bus-wait-for-units.h', + 'calendarspec.c', + 'calendarspec.h', + 'cgroup-setup.c', + 'cgroup-setup.h', + 'cgroup-show.c', + 'cgroup-show.h', + 'chown-recursive.c', + 'chown-recursive.h', + 'clean-ipc.c', + 'clean-ipc.h', + 'clock-util.c', + 'clock-util.h', + 'condition.c', + 'condition.h', + 'conf-parser.c', + 'conf-parser.h', + 'copy.c', + 'copy.h', + 'coredump-util.c', + 'coredump-util.h', + 'cpu-set-util.c', + 'cpu-set-util.h', + 'creds-util.c', + 'creds-util.h', + 'cryptsetup-util.c', + 'cryptsetup-util.h', + 'daemon-util.h', + 'data-fd-util.c', + 'data-fd-util.h', + 'dev-setup.c', + 'dev-setup.h', + 'device-nodes.c', + 'device-nodes.h', + 'devnode-acl.h', + 'discover-image.c', + 'discover-image.h', + 'dissect-image.c', + 'dissect-image.h', + 'dlfcn-util.c', + 'dlfcn-util.h', + 'dm-util.c', + 'dm-util.h', + 'dns-domain.c', + 'dns-domain.h', + 'dropin.c', + 'dropin.h', + 'efi-loader.c', + 'efi-loader.h', + 'elf-util.c', + 'elf-util.h', + 'enable-mempool.c', + 'env-file-label.c', + 'env-file-label.h', + 'ethtool-util.c', + 'ethtool-util.h', + 'exec-util.c', + 'exec-util.h', + 'exit-status.c', + 'exit-status.h', + 'extension-release.c', + 'extension-release.h', + 'fdisk-util.h', + 'fdset.c', + 'fdset.h', + 'fileio-label.c', + 'fileio-label.h', + 'firewall-util-nft.c', + 'firewall-util-private.h', + 'firewall-util.c', + 'firewall-util.h', + 'format-table.c', + 'format-table.h', + 'fsck-util.h', + 'fstab-util.c', + 'fstab-util.h', + 'generator.c', + 'generator.h', + 'geneve-util.c', + 'geneve-util.h', + 'gpt.c', + 'gpt.h', + 'group-record.c', + 'group-record.h', + 'hostname-setup.c', + 'hostname-setup.h', + 'hwdb-util.c', + 'hwdb-util.h', + 'id128-print.c', + 'id128-print.h', + 'idn-util.c', + 'idn-util.h', + 'ima-util.c', + 'ima-util.h', + 'import-util.c', + 'import-util.h', + 'in-addr-prefix-util.c', + 'in-addr-prefix-util.h', + 'initreq.h', + 'install-file.c', + 'install-file.h', + 'install-printf.c', + 'install-printf.h', + 'install.c', + 'install.h', + 'ip-protocol-list.c', + 'ip-protocol-list.h', + 'ipvlan-util.c', + 'ipvlan-util.h', + 'journal-importer.c', + 'journal-importer.h', + 'journal-util.c', + 'journal-util.h', + 'json-internal.h', + 'json.c', + 'json.h', + 'kbd-util.c', + 'kbd-util.h', + 'keyring-util.h', + 'keyring-util.c', + 'killall.c', + 'killall.h', + 'label.c', + 'label.h', + 'libcrypt-util.c', + 'libcrypt-util.h', + 'libfido2-util.c', + 'libfido2-util.h', + 'libmount-util.h', + 'linux/auto_dev-ioctl.h', + 'linux/bpf.h', + 'linux/bpf_common.h', + 'linux/bpf_insn.h', + 'linux/dm-ioctl.h', + 'linux/ethtool.h', + 'local-addresses.c', + 'local-addresses.h', + 'lockfile-util.c', + 'lockfile-util.h', + 'log-link.h', + 'logs-show.c', + 'logs-show.h', + 'loop-util.c', + 'loop-util.h', + 'loopback-setup.c', + 'loopback-setup.h', + 'machine-id-setup.c', + 'machine-id-setup.h', + 'machine-pool.c', + 'machine-pool.h', + 'macvlan-util.c', + 'macvlan-util.h', + 'main-func.h', + 'mkdir-label.c', + 'mkdir-label.h', + 'mkfs-util.c', + 'mkfs-util.h', + 'module-util.h', + 'mount-setup.c', + 'mount-setup.h', + 'mount-util.c', + 'mount-util.h', + 'net-condition.c', + 'net-condition.h', + 'netif-naming-scheme.c', + 'netif-naming-scheme.h', + 'netif-sriov.c', + 'netif-sriov.h', + 'netif-util.c', + 'netif-util.h', + 'nscd-flush.h', + 'nsflags.c', + 'nsflags.h', + 'numa-util.c', + 'numa-util.h', + 'openssl-util.c', + 'openssl-util.h', + 'output-mode.c', + 'output-mode.h', + 'pager.c', + 'pager.h', + 'parse-argument.c', + 'parse-argument.h', + 'parse-socket-bind-item.c', + 'parse-socket-bind-item.h', + 'pcre2-dlopen.c', + 'pcre2-dlopen.h', + 'pe-header.h', + 'pkcs11-util.c', + 'pkcs11-util.h', + 'pretty-print.c', + 'pretty-print.h', + 'psi-util.c', + 'psi-util.h', + 'ptyfwd.c', + 'ptyfwd.h', + 'pwquality-util.c', + 'pwquality-util.h', + 'qrcode-util.c', + 'qrcode-util.h', + 'quota-util.c', + 'quota-util.h', + 'reboot-util.c', + 'reboot-util.h', + 'resize-fs.c', + 'resize-fs.h', + 'resolve-util.c', + 'resolve-util.h', + 'rm-rf.c', + 'rm-rf.h', + 'seccomp-util.h', + 'securebits-util.c', + 'securebits-util.h', + 'selinux-util.c', + 'selinux-util.h', + 'serialize.c', + 'serialize.h', + 'service-util.c', + 'service-util.h', + 'sleep-config.c', + 'sleep-config.h', + 'smack-util.c', + 'smack-util.h', + 'socket-label.c', + 'socket-netlink.c', + 'socket-netlink.h', + 'spawn-ask-password-agent.c', + 'spawn-ask-password-agent.h', + 'spawn-polkit-agent.c', + 'spawn-polkit-agent.h', + 'specifier.c', + 'specifier.h', + 'switch-root.c', + 'switch-root.h', + 'tmpfile-util-label.c', + 'tmpfile-util-label.h', + 'tomoyo-util.c', + 'tomoyo-util.h', + 'tpm2-util.c', + 'tpm2-util.h', + 'udev-util.c', + 'udev-util.h', + 'uid-alloc-range.c', + 'uid-alloc-range.h', + 'uid-range.c', + 'uid-range.h', + 'user-record-nss.c', + 'user-record-nss.h', + 'user-record-show.c', + 'user-record-show.h', + 'user-record.c', + 'user-record.h', + 'userdb-dropin.c', + 'userdb-dropin.h', + 'userdb.c', + 'userdb.h', + 'utmp-wtmp.h', + 'varlink.c', + 'varlink.h', + 'verb-log-control.c', + 'verb-log-control.h', + 'verbs.c', + 'verbs.h', + 'vlan-util.c', + 'vlan-util.h', + 'volatile-util.c', + 'volatile-util.h', + 'watchdog.c', + 'watchdog.h', + 'web-util.c', + 'web-util.h', + 'wifi-util.c', + 'wifi-util.h', + 'xml.c', + 'xml.h') if get_option('tests') != 'false' - shared_sources += files(''' - test-tables.h - tests.c - tests.h - '''.split()) + shared_sources += files( + 'test-tables.h', + 'tests.c', + 'tests.h') endif generate_syscall_list = find_program('generate-syscall-list.py') @@ -354,10 +352,9 @@ syscall_list_h = custom_target( capture : true) if conf.get('HAVE_ACL') == 1 - shared_sources += files(''' - acl-util.c - devnode-acl.c - '''.split()) + shared_sources += files( + 'acl-util.c', + 'devnode-acl.c') endif if conf.get('ENABLE_UTMP') == 1 @@ -374,10 +371,9 @@ if conf.get('HAVE_LIBIPTC') == 1 endif if conf.get('HAVE_LIBBPF') == 1 - shared_sources += files(''' - bpf-link.c - bpf-link.h - '''.split()) + shared_sources += files( + 'bpf-link.c', + 'bpf-link.h') endif if conf.get('HAVE_KMOD') == 1 diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build index fcc9f9f0ac..a4f4d39814 100644 --- a/src/shutdown/meson.build +++ b/src/shutdown/meson.build @@ -1,10 +1,9 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_shutdown_sources = files(''' - shutdown.c - umount.c - umount.h -'''.split()) +systemd_shutdown_sources = files( + 'shutdown.c', + 'umount.c', + 'umount.h') tests += [ [files('test-umount.c', diff --git a/src/sysext/meson.build b/src/sysext/meson.build index 1517df414e..f159adb8cc 100644 --- a/src/sysext/meson.build +++ b/src/sysext/meson.build @@ -1,5 +1,3 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_sysext_sources = files(''' - sysext.c -'''.split()) +systemd_sysext_sources = files('sysext.c') diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 4f40b9f57f..324e7cfd0c 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -1,43 +1,41 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -_systemd_headers = ''' - sd-bus.h - sd-bus-protocol.h - sd-bus-vtable.h - sd-daemon.h - sd-device.h - sd-event.h - sd-hwdb.h - sd-id128.h - sd-journal.h - sd-login.h - sd-messages.h - sd-path.h -'''.split() +_systemd_headers = [ + 'sd-bus.h', + 'sd-bus-protocol.h', + 'sd-bus-vtable.h', + 'sd-daemon.h', + 'sd-device.h', + 'sd-event.h', + 'sd-hwdb.h', + 'sd-id128.h', + 'sd-journal.h', + 'sd-login.h', + 'sd-messages.h', + 'sd-path.h'] # https://github.com/mesonbuild/meson/issues/1633 systemd_headers = files(_systemd_headers) -_not_installed_headers = ''' - sd-dhcp6-client.h - sd-dhcp6-lease.h - sd-dhcp-client.h - sd-dhcp-lease.h - sd-dhcp-option.h - sd-dhcp6-option.h - sd-dhcp-server.h - sd-ipv4acd.h - sd-ipv4ll.h - sd-lldp-rx.h - sd-lldp-tx.h - sd-lldp.h - sd-ndisc.h - sd-netlink.h - sd-network.h - sd-radv.h - sd-resolve.h - sd-utf8.h -'''.split() +_not_installed_headers = [ + 'sd-dhcp6-client.h', + 'sd-dhcp6-lease.h', + 'sd-dhcp-client.h', + 'sd-dhcp-lease.h', + 'sd-dhcp-option.h', + 'sd-dhcp6-option.h', + 'sd-dhcp-server.h', + 'sd-ipv4acd.h', + 'sd-ipv4ll.h', + 'sd-lldp-rx.h', + 'sd-lldp-tx.h', + 'sd-lldp.h', + 'sd-ndisc.h', + 'sd-netlink.h', + 'sd-network.h', + 'sd-radv.h', + 'sd-resolve.h', + 'sd-utf8.h'] install_headers( systemd_headers, diff --git a/src/udev/meson.build b/src/udev/meson.build index 7d1e6d06bf..ada367c85a 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -1,47 +1,45 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -udevadm_sources = files(''' - udevadm.c - udevadm.h - udevadm-control.c - udevadm-hwdb.c - udevadm-info.c - udevadm-monitor.c - udevadm-settle.c - udevadm-test.c - udevadm-test-builtin.c - udevadm-trigger.c - udevadm-util.c - udevadm-util.h - udevd.c -'''.split()) - -libudevd_core_sources = ''' - udev-ctrl.c - udev-ctrl.h - udev-event.c - udev-event.h - udev-node.c - udev-node.h - udev-rules.c - udev-rules.h - udev-watch.c - udev-watch.h - udev-builtin.c - udev-builtin.h - udev-builtin-btrfs.c - udev-builtin-hwdb.c - udev-builtin-input_id.c - udev-builtin-keyboard.c - udev-builtin-net_id.c - udev-builtin-net_setup_link.c - udev-builtin-path_id.c - udev-builtin-usb_id.c - udev-netlink.c - udev-netlink.h - net/link-config.c - net/link-config.h -'''.split() +udevadm_sources = files( + 'udevadm.c', + 'udevadm.h', + 'udevadm-control.c', + 'udevadm-hwdb.c', + 'udevadm-info.c', + 'udevadm-monitor.c', + 'udevadm-settle.c', + 'udevadm-test.c', + 'udevadm-test-builtin.c', + 'udevadm-trigger.c', + 'udevadm-util.c', + 'udevadm-util.h', + 'udevd.c') + +libudevd_core_sources = [ + 'udev-ctrl.c', + 'udev-ctrl.h', + 'udev-event.c', + 'udev-event.h', + 'udev-node.c', + 'udev-node.h', + 'udev-rules.c', + 'udev-rules.h', + 'udev-watch.c', + 'udev-watch.h', + 'udev-builtin.c', + 'udev-builtin.h', + 'udev-builtin-btrfs.c', + 'udev-builtin-hwdb.c', + 'udev-builtin-input_id.c', + 'udev-builtin-keyboard.c', + 'udev-builtin-net_id.c', + 'udev-builtin-net_setup_link.c', + 'udev-builtin-path_id.c', + 'udev-builtin-usb_id.c', + 'udev-netlink.c', + 'udev-netlink.h', + 'net/link-config.c', + 'net/link-config.h'] if conf.get('HAVE_KMOD') == 1 libudevd_core_sources += ['udev-builtin-kmod.c'] diff --git a/src/userdb/meson.build b/src/userdb/meson.build index 3a6225e01e..a17d7bb328 100644 --- a/src/userdb/meson.build +++ b/src/userdb/meson.build @@ -1,15 +1,10 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -systemd_userwork_sources = files(''' - userwork.c -'''.split()) +systemd_userwork_sources = files('userwork.c') -systemd_userdbd_sources = files(''' - userdbd-manager.c - userdbd-manager.h - userdbd.c -'''.split()) +systemd_userdbd_sources = files( + 'userdbd-manager.c', + 'userdbd-manager.h', + 'userdbd.c') -userdbctl_sources = files(''' - userdbctl.c -'''.split()) +userdbctl_sources = files('userdbctl.c') |