Merge pull request #28611 from yuwata/meson-use-template

meson: use template (part 4)

diff --git a/meson.build b/meson.build
index 6e79e2dd670e5cd098fd04abe66e7a31652fe55c..acab81df4c760cff0c98eda05d5622089c018fcf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2370,23 +2370,34 @@ subdir('src/journal')
 # systemd-networkd requires 'libsystemd_network'
 subdir('src/libsystemd-network')
 
+subdir('src/ac-power')
 subdir('src/analyze')
 subdir('src/backlight')
+subdir('src/battery-check')
+subdir('src/binfmt')
 subdir('src/boot')
 subdir('src/boot/efi')
 subdir('src/busctl')
+subdir('src/cgroups-agent')
 subdir('src/coredump')
+subdir('src/creds')
 subdir('src/cryptenroll')
 subdir('src/cryptsetup')
 subdir('src/debug-generator')
+subdir('src/delta')
+subdir('src/detect-virt')
 subdir('src/dissect')
 subdir('src/environment-d-generator')
+subdir('src/escape')
+subdir('src/firstboot')
+subdir('src/fsck')
 subdir('src/fstab-generator')
 subdir('src/getty-generator')
 subdir('src/gpt-auto-generator')
 subdir('src/hibernate-resume')
 subdir('src/home')
 subdir('src/hostname')
+subdir('src/id128')
 subdir('src/import')
 subdir('src/integritysetup')
 subdir('src/journal-remote')
@@ -2394,7 +2405,9 @@ subdir('src/kernel-install')
 subdir('src/locale')
 subdir('src/login')
 subdir('src/machine')
+subdir('src/machine-id-setup')
 subdir('src/network')
+subdir('src/notify')
 subdir('src/nspawn')
 subdir('src/nss-myhostname')
 subdir('src/nss-mymachines')
@@ -2402,15 +2415,20 @@ subdir('src/nss-resolve')
 subdir('src/nss-systemd')
 subdir('src/oom')
 subdir('src/partition')
+subdir('src/path')
 subdir('src/portable')
 subdir('src/pstore')
+subdir('src/random-seed')
 subdir('src/rc-local-generator')
+subdir('src/remount-fs')
 subdir('src/resolve')
 subdir('src/rfkill')
 subdir('src/rpm')
 subdir('src/run-generator')
 subdir('src/shutdown')
+subdir('src/sleep')
 subdir('src/socket-activate')
+subdir('src/sysctl')
 subdir('src/sysext')
 subdir('src/system-update-generator')
 subdir('src/systemctl')
@@ -2421,7 +2439,9 @@ subdir('src/timesync')
 subdir('src/tmpfiles')
 subdir('src/user-sessions')
 subdir('src/userdb')
+subdir('src/vconsole')
 subdir('src/veritysetup')
+subdir('src/volatile-root')
 subdir('src/xdg-autostart-generator')
 
 subdir('src/systemd')
@@ -2581,482 +2601,9 @@ meson.add_install_script(meson_make_symlink,
                          bindir / 'udevadm',
                          libexecdir / 'systemd-udevd')
 
-if conf.get('ENABLE_MACHINED') == 1
-        dbus_programs += executable(
-                'systemd-machined',
-                systemd_machined_sources,
-                include_directories : includes,
-                link_with : [libmachine_core,
-                             libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        public_programs += executable(
-                'machinectl',
-                'src/machine/machinectl.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [liblz4,
-                                libxz,
-                                libzstd,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true)
-endif
-
-if conf.get('ENABLE_IMPORTD') == 1
-        dbus_programs += executable(
-                'systemd-importd',
-                systemd_importd_sources,
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        systemd_pull = executable(
-                'systemd-pull',
-                systemd_pull_sources,
-                include_directories : includes,
-                link_with : [libshared,
-                             lib_import_common],
-                dependencies : [lib_openssl_or_gcrypt,
-                                libbzip2,
-                                libcurl,
-                                libxz,
-                                libz,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        systemd_import = executable(
-                'systemd-import',
-                systemd_import_sources,
-                include_directories : includes,
-                link_with : [libshared,
-                             lib_import_common],
-                dependencies : [libbzip2,
-                                libcurl,
-                                libxz,
-                                libz,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        systemd_import_fs = executable(
-                'systemd-import-fs',
-                systemd_import_fs_sources,
-                include_directories : includes,
-                link_with : [libshared,
-                             lib_import_common],
-                dependencies : [userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        systemd_export = executable(
-                'systemd-export',
-                systemd_export_sources,
-                include_directories : includes,
-                link_with : [libshared,
-                             lib_import_common],
-                dependencies : [libbzip2,
-                                libcurl,
-                                libxz,
-                                libz,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        public_programs += [systemd_pull, systemd_import, systemd_import_fs, systemd_export]
-endif
-
-if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1
-        public_programs += executable(
-                'systemd-journal-upload',
-                systemd_journal_upload_sources,
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libcurl,
-                                libgnutls,
-                                liblz4,
-                                libxz,
-                                libzstd,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-endif
-
-if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
-        public_programs += executable(
-                'systemd-journal-remote',
-                systemd_journal_remote_sources,
-                include_directories : journal_includes,
-                link_with : [libshared,
-                             libsystemd_journal_remote],
-                dependencies : [libgnutls,
-                                liblz4,
-                                libmicrohttpd,
-                                libxz,
-                                libzstd,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        public_programs += executable(
-                'systemd-journal-gatewayd',
-                systemd_journal_gatewayd_sources,
-                include_directories : journal_includes,
-                link_with : [libshared],
-                dependencies : [libgnutls,
-                                liblz4,
-                                libmicrohttpd,
-                                libxz,
-                                libzstd,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-endif
-
-if conf.get('ENABLE_COREDUMP') == 1
-        executable(
-                'systemd-coredump',
-                systemd_coredump_sources,
-                include_directories : includes,
-                link_with : [libshared,
-                             libbasic_compress],
-                dependencies : [libacl,
-                                liblz4,
-                                libxz,
-                                libzstd,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        public_programs += executable(
-                'coredumpctl',
-                coredumpctl_sources,
-                include_directories : includes,
-                link_with : [libshared,
-                             libbasic_compress],
-                dependencies : [liblz4,
-                                libxz,
-                                libzstd,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true)
-endif
-
-if conf.get('ENABLE_PSTORE') == 1
-        executable(
-                'systemd-pstore',
-                systemd_pstore_sources,
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libacl,
-                                liblz4,
-                                libxz,
-                                libzstd,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-endif
-
-if conf.get('ENABLE_OOMD') == 1
-        dbus_programs += executable('systemd-oomd',
-                   systemd_oomd_sources,
-                   include_directories : includes,
-                   link_with : [libshared],
-                   dependencies : [libatomic,
-                                   userspace],
-                   install_rpath : pkglibdir,
-                   install : true,
-                   install_dir : libexecdir)
-
-        public_programs += executable(
-                'oomctl',
-                oomctl_sources,
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [userspace],
-                install_rpath : pkglibdir,
-                install : true)
-endif
-
-if conf.get('ENABLE_BINFMT') == 1
-        public_programs += executable(
-                'systemd-binfmt',
-                'src/binfmt/binfmt.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        meson.add_install_script('sh', '-c',
-                                 mkdir_p.format(binfmtdir))
-        if install_sysconfdir
-                meson.add_install_script('sh', '-c',
-                                         mkdir_p.format(sysconfdir / 'binfmt.d'))
-        endif
-endif
-
-if conf.get('ENABLE_SYSUPDATE') == 1
-        exe = executable(
-                'systemd-sysupdate',
-                systemd_sysupdate_sources,
-                include_directories : includes,
-                link_with : [libshared,
-                             libshared_fdisk],
-                dependencies : [libblkid,
-                                libfdisk,
-                                libopenssl,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-        public_programs += exe
-endif
-
-if conf.get('ENABLE_VCONSOLE') == 1
-        executable(
-                'systemd-vconsole-setup',
-                'src/vconsole/vconsole-setup.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-endif
-
-if conf.get('ENABLE_RANDOMSEED') == 1
-        executable(
-                'systemd-random-seed',
-                'src/random-seed/random-seed.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-endif
-
-if conf.get('ENABLE_FIRSTBOOT') == 1
-        public_programs += executable(
-                'systemd-firstboot',
-                'src/firstboot/firstboot.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libcrypt,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true)
-endif
-
-executable(
-        'systemd-remount-fs',
-        'src/remount-fs/remount-fs.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-executable(
-        'systemd-machine-id-setup',
-        'src/machine-id-setup/machine-id-setup-main.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-executable(
-        'systemd-fsck',
-        'src/fsck/fsck.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-executable(
-        'systemd-growfs',
-        'src/partition/growfs.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-executable(
-        'systemd-makefs',
-        'src/partition/makefs.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-executable(
-        'systemd-sleep',
-        'src/sleep/sleep.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-if install_sysconfdir_samples
-        install_data('src/sleep/sleep.conf',
-                     install_dir : pkgsysconfdir)
-endif
-
-public_programs += executable(
-        'systemd-sysctl',
-        'src/sysctl/sysctl.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-public_programs += executable(
-        'systemd-ac-power',
-        'src/ac-power/ac-power.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-detect-virt',
-        'src/detect-virt/detect-virt.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-delta',
-        'src/delta/delta.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-escape',
-        'src/escape/escape.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-notify',
-        'src/notify/notify.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-creds',
-        'src/creds/creds.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [threads,
-                        libopenssl,
-                        userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-battery-check',
-        'src/battery-check/battery-check.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install_dir : libexecdir,
-        install : true)
-
-# Protecting files from the distro in /usr doesn't make sense since they can be trivially accessed otherwise,
-# so don't restrict the access mode in /usr. That doesn't apply to /etc, so we do restrict the access mode
-# there.
-meson.add_install_script('sh', '-c', mkdir_p.format(credstoredir))
-if install_sysconfdir
-        # Keep in sync with tmpfiles.d/credstore.conf
-        meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore', '0700'))
-        meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore.encrypted', '0700'))
-endif
-
-executable(
-        'systemd-volatile-root',
-        'src/volatile-root/volatile-root.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : userspace,
-        install_rpath : pkglibdir,
-        install : conf.get('ENABLE_INITRD') == 1,
-        install_dir : libexecdir)
-
-executable(
-        'systemd-cgroups-agent',
-        'src/cgroups-agent/cgroups-agent.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : userspace,
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-systemd_id128 = executable(
-        'systemd-id128',
-        'src/id128/id128.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-public_programs += systemd_id128
-
 if want_tests != 'false'
         systemctl = executables_by_name.get('systemctl')
+        systemd_id128 = executables_by_name.get('systemd-id128')
         test('test-systemctl-enable',
              test_systemctl_enable_sh,
              # https://github.com/mesonbuild/meson/issues/2681
@@ -3064,15 +2611,6 @@ if want_tests != 'false'
                      systemd_id128.full_path()])
 endif
 
-public_programs += executable(
-        'systemd-path',
-        'src/path/path.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
 public_programs += executable(
         'systemd-ask-password',
         'src/ask-password/ask-password.c',
@@ -3320,45 +2858,6 @@ if want_tests != 'false'
              args : ['verify', '--resolve-names=never', all_rules])
 endif
 
-if conf.get('ENABLE_REPART') == 1
-        exe = executable(
-                'systemd-repart',
-                systemd_repart_sources,
-                include_directories : includes,
-                link_with : [libshared,
-                             libshared_fdisk],
-                dependencies : [libblkid,
-                                libfdisk,
-                                libopenssl,
-                                threads,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true)
-        public_programs += exe
-
-        exe = executable(
-                'systemd-repart.standalone',
-                systemd_repart_sources,
-                include_directories : includes,
-                c_args : '-DSTANDALONE',
-                link_with : [libshared_static,
-                             libbasic,
-                             libbasic_gcrypt,
-                             libsystemd_static,
-                             libshared_fdisk],
-                dependencies : [libblkid,
-                                libfdisk,
-                                libopenssl,
-                                threads,
-                                userspace],
-                build_by_default: have_standalone_binaries,
-                install_rpath : pkglibdir,
-                install : have_standalone_binaries)
-        if have_standalone_binaries
-                public_programs += exe
-        endif
-endif
-
 executable(
         'systemd-shutdown',
         systemd_shutdown_sources,

diff --git a/src/ac-power/meson.build b/src/ac-power/meson.build
new file mode 100644 (file)
index 0000000..032c027
--- /dev/null
+++ b/src/ac-power/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-ac-power',
+                'public' : true,
+                'sources' : files('ac-power.c'),
+        },
+]

diff --git a/src/battery-check/meson.build b/src/battery-check/meson.build
new file mode 100644 (file)
index 0000000..370d4d4
--- /dev/null
+++ b/src/battery-check/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-battery-check',
+                'public' : true,
+                'sources' : files('battery-check.c'),
+        },
+]

diff --git a/src/binfmt/meson.build b/src/binfmt/meson.build
new file mode 100644 (file)
index 0000000..e33f81a
--- /dev/null
+++ b/src/binfmt/meson.build
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-binfmt',
+                'public' : true,
+                'conditions' : ['ENABLE_BINFMT'],
+                'sources' : files('binfmt.c'),
+        },
+]
+
+if conf.get('ENABLE_BINFMT') == 1
+        meson.add_install_script('sh', '-c',
+                         mkdir_p.format(binfmtdir))
+        if install_sysconfdir
+                meson.add_install_script('sh', '-c',
+                                         mkdir_p.format(sysconfdir / 'binfmt.d'))
+        endif
+endif

diff --git a/src/cgroups-agent/meson.build b/src/cgroups-agent/meson.build
new file mode 100644 (file)
index 0000000..33ff1f5
--- /dev/null
+++ b/src/cgroups-agent/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-cgroups-agent',
+                'sources' : files('cgroups-agent.c'),
+        },
+]

diff --git a/src/coredump/meson.build b/src/coredump/meson.build
index fb31a2148fcd82390583df4c30faf441813a987e..89468b1fbceb181ddc73bdfe256bffec3045eb07 100644 (file)
--- a/src/coredump/meson.build
+++ b/src/coredump/meson.build
@@ -5,7 +5,35 @@ systemd_coredump_sources = files(
         'coredump-vacuum.c',
 )
 
-coredumpctl_sources = files('coredumpctl.c')
+common_link_with = [
+        libshared,
+        libbasic_compress,
+]
+
+common_dependencies = [
+        liblz4,
+        libxz,
+        libzstd,
+        threads,
+]
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-coredump',
+                'conditions' : ['ENABLE_COREDUMP'],
+                'sources' : systemd_coredump_sources,
+                'link_with' : common_link_with,
+                'dependencies' : common_dependencies + [libacl],
+        },
+        executable_template + {
+                'name' : 'coredumpctl',
+                'public' : true,
+                'conditions' : ['ENABLE_COREDUMP'],
+                'sources' : files('coredumpctl.c'),
+                'link_with' : common_link_with,
+                'dependencies' : common_dependencies,
+        },
+]
 
 if conf.get('ENABLE_COREDUMP') == 1 and install_sysconfdir_samples
         install_data('coredump.conf',

diff --git a/src/creds/meson.build b/src/creds/meson.build
new file mode 100644 (file)
index 0000000..905c349
--- /dev/null
+++ b/src/creds/meson.build
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-creds',
+                'public' : true,
+                'sources' : files('creds.c'),
+                'dependencies' : [
+                        libopenssl,
+                        threads,
+                ],
+        },
+]
+
+# Protecting files from the distro in /usr doesn't make sense since they can be trivially accessed otherwise,
+# so don't restrict the access mode in /usr. That doesn't apply to /etc, so we do restrict the access mode
+# there.
+meson.add_install_script('sh', '-c', mkdir_p.format(credstoredir))
+if install_sysconfdir
+        # Keep in sync with tmpfiles.d/credstore.conf
+        meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore', '0700'))
+        meson.add_install_script('sh', '-c', mkdir_p_mode.format(sysconfdir / 'credstore.encrypted', '0700'))
+endif

diff --git a/src/delta/meson.build b/src/delta/meson.build
new file mode 100644 (file)
index 0000000..31c4be2
--- /dev/null
+++ b/src/delta/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-delta',
+                'public' : true,
+                'sources' : files('delta.c'),
+        },
+]

diff --git a/src/detect-virt/meson.build b/src/detect-virt/meson.build
new file mode 100644 (file)
index 0000000..7bcb298
--- /dev/null
+++ b/src/detect-virt/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-detect-virt',
+                'public' : true,
+                'sources' : files('detect-virt.c'),
+        },
+]

diff --git a/src/escape/meson.build b/src/escape/meson.build
new file mode 100644 (file)
index 0000000..d21b372
--- /dev/null
+++ b/src/escape/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-escape',
+                'public' : true,
+                'sources' : files('escape.c'),
+        },
+]

diff --git a/src/firstboot/meson.build b/src/firstboot/meson.build
new file mode 100644 (file)
index 0000000..28c1d27
--- /dev/null
+++ b/src/firstboot/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-firstboot',
+                'public' : true,
+                'conditions' : ['ENABLE_FIRSTBOOT'],
+                'sources' : files('firstboot.c'),
+                'dependencies' : libcrypt,
+        },
+]

diff --git a/src/fsck/meson.build b/src/fsck/meson.build
new file mode 100644 (file)
index 0000000..e85e8c0
--- /dev/null
+++ b/src/fsck/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-fsck',
+                'sources' : files('fsck.c'),
+        },
+]

diff --git a/src/id128/meson.build b/src/id128/meson.build
new file mode 100644 (file)
index 0000000..13798ae
--- /dev/null
+++ b/src/id128/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-id128',
+                'public' : true,
+                'sources' : files('id128.c'),
+        },
+]

diff --git a/src/import/meson.build b/src/import/meson.build
index 488855bf78fbf942ec1192e5e5c4b9f73f8649a0..9d63e613cfeebcd8d6ffc614c67fd64b5b79335d 100644 (file)
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 systemd_importd_sources = files(
-        'importd.c')
+        'importd.c',
+)
 
 systemd_pull_sources = files(
         'pull.c',
@@ -19,7 +20,8 @@ systemd_import_sources = files(
 )
 
 systemd_import_fs_sources = files(
-        'import-fs.c')
+        'import-fs.c',
+)
 
 systemd_export_sources = files(
         'export.c',
@@ -27,19 +29,80 @@ systemd_export_sources = files(
         'export-raw.c',
 )
 
-if conf.get('ENABLE_IMPORTD') == 1
-        lib_import_common = static_library(
-                'import-common',
-                'import-common.c',
-                'import-compress.c',
-                'qcow2-util.c',
-                include_directories : includes,
-                dependencies : [libbzip2,
-                                libxz,
-                                libz,
-                                userspace],
-                build_by_default : false)
+importd_common_sources = files(
+        'import-common.c',
+        'import-compress.c',
+        'qcow2-util.c',
+)
+
+lib_import_common = static_library(
+        'import-common',
+        sources : importd_common_sources,
+        include_directories : includes,
+        dependencies : [
+                libbzip2,
+                libxz,
+                libz,
+                userspace,
+        ],
+        build_by_default : false)
+
+common_libs = [
+        lib_import_common,
+        libshared,
+]
+
+common_deps = [
+        libbzip2,
+        libcurl,
+        libxz,
+        libz,
+]
 
+executables += [
+        libexec_template + {
+                'name' : 'systemd-importd',
+                'dbus' : true,
+                'conditions' : ['ENABLE_IMPORTD'],
+                'sources' : systemd_importd_sources,
+                'dependencies' : threads,
+        },
+        libexec_template + {
+                'name' : 'systemd-pull',
+                'public' : true,
+                'conditions' : ['ENABLE_IMPORTD'],
+                'sources' : systemd_pull_sources,
+                'link_with' : common_libs,
+                'dependencies' : common_deps + [
+                        lib_openssl_or_gcrypt,
+                ],
+        },
+        libexec_template + {
+                'name' : 'systemd-import',
+                'public' : true,
+                'conditions' : ['ENABLE_IMPORTD'],
+                'sources' : systemd_import_sources,
+                'link_with' : common_libs,
+                'dependencies' : common_deps,
+        },
+        libexec_template + {
+                'name' : 'systemd-import-fs',
+                'public' : true,
+                'conditions' : ['ENABLE_IMPORTD'],
+                'sources' : systemd_import_fs_sources,
+                'link_with' : common_libs,
+        },
+        libexec_template + {
+                'name' : 'systemd-export',
+                'public' : true,
+                'conditions' : ['ENABLE_IMPORTD'],
+                'sources' : systemd_export_sources,
+                'link_with' : common_libs,
+                'dependencies' : common_deps,
+        },
+]
+
+if conf.get('ENABLE_IMPORTD') == 1
         install_data('org.freedesktop.import1.conf',
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.import1.service',

diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 9fe1b8049b58144b7df7aceefe1194bcc1bade5e..89419f1de17dfc03e44d2ac0381b146b6fe5fe14 100644 (file)
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -37,6 +37,52 @@ systemd_journal_gatewayd_sources = files(
         'microhttpd-util.c',
 )
 
+common_deps = [
+        libgnutls,
+        liblz4,
+        libxz,
+        libzstd,
+        threads,
+]
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-journal-upload',
+                'public' : true,
+                'conditions' : [
+                        'ENABLE_REMOTE',
+                        'HAVE_LIBCURL',
+                ],
+                'sources' : systemd_journal_upload_sources,
+                'dependencies' : common_deps + [libcurl],
+        },
+        libexec_template + {
+                'name' : 'systemd-journal-remote',
+                'public' : true,
+                'conditions' : [
+                        'ENABLE_REMOTE',
+                        'HAVE_MICROHTTPD',
+                ],
+                'sources' : systemd_journal_remote_sources,
+                'include_directories' : journal_includes,
+                'link_with' : [
+                        libshared,
+                        libsystemd_journal_remote,
+                ],
+                'dependencies' : common_deps + [libmicrohttpd],
+        },
+        libexec_template + {
+                'name' : 'systemd-journal-gatewayd',
+                'public' : true,
+                'conditions' : [
+                        'ENABLE_REMOTE',
+                        'HAVE_MICROHTTPD',
+                ],
+                'sources' : systemd_journal_gatewayd_sources,
+                'dependencies' : common_deps + [libmicrohttpd],
+        },
+]
+
 in_files = [
         ['journal-upload.conf',
          conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 and install_sysconfdir_samples],

diff --git a/src/machine-id-setup/meson.build b/src/machine-id-setup/meson.build
new file mode 100644 (file)
index 0000000..316165a
--- /dev/null
+++ b/src/machine-id-setup/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-machine-id-setup',
+                'sources' : files('machine-id-setup-main.c'),
+        },
+]

diff --git a/src/machine/meson.build b/src/machine/meson.build
index d8b2dd188d0ea2035d13f7d42b884487cbf054b0..2adc1bd37b14a1ddb26a67887c922cfa6a3dd427 100644 (file)
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-systemd_machined_sources = files(
-        'machined.c',
-)
-
 libmachine_core_sources = files(
         'image-dbus.c',
         'machine-dbus.c',
@@ -22,6 +18,31 @@ libmachine_core = static_library(
                         userspace],
         build_by_default : false)
 
+executables += [
+        libexec_template + {
+                'name' : 'systemd-machined',
+                'dbus' : true,
+                'conditions' : ['ENABLE_MACHINED'],
+                'sources' : files('machined.c'),
+                'link_with' : [
+                        libmachine_core,
+                        libshared,
+                ],
+        },
+        executable_template + {
+                'name' : 'machinectl',
+                'public' : true,
+                'conditions' : ['ENABLE_MACHINED'],
+                'sources' : files('machinectl.c'),
+                'dependencies' : [
+                        liblz4,
+                        libxz,
+                        libzstd,
+                        threads,
+                ],
+        },
+]
+
 if conf.get('ENABLE_MACHINED') == 1
         install_data('org.freedesktop.machine1.conf',
                      install_dir : dbuspolicydir)

diff --git a/src/notify/meson.build b/src/notify/meson.build
new file mode 100644 (file)
index 0000000..3baa086
--- /dev/null
+++ b/src/notify/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-notify',
+                'public' : true,
+                'sources' : files('notify.c'),
+        },
+]

diff --git a/src/oom/meson.build b/src/oom/meson.build
index 8d31f05c9849e5771ed7b528ae9c2f0df02b6192..b475fbf12c88e2121d203714428d96e5dd2e0601 100644 (file)
--- a/src/oom/meson.build
+++ b/src/oom/meson.build
@@ -7,7 +7,21 @@ systemd_oomd_sources = files(
         'oomd.c',
 )
 
-oomctl_sources = files('oomctl.c')
+executables += [
+        libexec_template + {
+                'name' : 'systemd-oomd',
+                'dbus' : true,
+                'conditions' : ['ENABLE_OOMD'],
+                'sources' : systemd_oomd_sources,
+                'dependencies' : libatomic,
+        },
+        executable_template + {
+                'name' : 'oomctl',
+                'public' : true,
+                'conditions' : ['ENABLE_OOMD'],
+                '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 a7a6c293792532c6245dacd3ab1efc66ecde28e5..19f49f606e5fcaf962ead8565fe18307c268e0b1 100644 (file)
--- a/src/partition/meson.build
+++ b/src/partition/meson.build
@@ -1,3 +1,50 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-systemd_repart_sources = files('repart.c')
+executables += [
+        libexec_template + {
+                'name' : 'systemd-growfs',
+                'sources' : files('growfs.c'),
+        },
+        libexec_template + {
+                'name' : 'systemd-makefs',
+                'sources' : files('makefs.c'),
+        },
+        executable_template + {
+                'name' : 'systemd-repart',
+                'public' : true,
+                'conditions' : ['ENABLE_REPART'],
+                'sources' : files('repart.c'),
+                'link_with' : [
+                        libshared,
+                        libshared_fdisk,
+                ],
+                'dependencies' : [
+                        libblkid,
+                        libfdisk,
+                        libopenssl,
+                        threads,
+                ],
+        },
+        executable_template + {
+                'name' : 'systemd-repart.standalone',
+                'public' : have_standalone_binaries,
+                'conditions' : ['ENABLE_REPART'],
+                'sources' : files('repart.c'),
+                'c_args' : '-DSTANDALONE',
+                'link_with' : [
+                        libbasic,
+                        libbasic_gcrypt,
+                        libshared_fdisk,
+                        libshared_static,
+                        libsystemd_static,
+                ],
+                'dependencies' : [
+                        libblkid,
+                        libfdisk,
+                        libopenssl,
+                        threads,
+                ],
+                'build_by_default' : have_standalone_binaries,
+                'install' : have_standalone_binaries,
+        },
+]

diff --git a/src/path/meson.build b/src/path/meson.build
new file mode 100644 (file)
index 0000000..70d3dd0
--- /dev/null
+++ b/src/path/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-path',
+                'public' : true,
+                'sources' : files('path.c'),
+        },
+]

diff --git a/src/pstore/meson.build b/src/pstore/meson.build
index 76b656a4b8ab291c28781656a7357d2b02503550..122ba2ee3ee3a13cee3d7ec3b7182adab9b57ea7 100644 (file)
--- a/src/pstore/meson.build
+++ b/src/pstore/meson.build
@@ -1,6 +1,19 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-systemd_pstore_sources = files('pstore.c')
+executables += [
+        libexec_template + {
+                'name' : 'systemd-pstore',
+                'conditions' : ['ENABLE_PSTORE'],
+                'sources' : files('pstore.c'),
+                'dependencies' : [
+                        libacl,
+                        liblz4,
+                        libxz,
+                        libzstd,
+                        threads,
+                ],
+        },
+]
 
 if conf.get('ENABLE_PSTORE') == 1 and install_sysconfdir_samples
         install_data('pstore.conf',

diff --git a/src/random-seed/meson.build b/src/random-seed/meson.build
new file mode 100644 (file)
index 0000000..daa2eef
--- /dev/null
+++ b/src/random-seed/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-random-seed',
+                'conditions' : ['ENABLE_RANDOMSEED'],
+                'sources' : files('random-seed.c'),
+        },
+]

diff --git a/src/remount-fs/meson.build b/src/remount-fs/meson.build
new file mode 100644 (file)
index 0000000..8761d25
--- /dev/null
+++ b/src/remount-fs/meson.build
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-remount-fs',
+                'sources' : files('remount-fs.c'),
+        },
+]

diff --git a/src/sleep/meson.build b/src/sleep/meson.build
new file mode 100644 (file)
index 0000000..ba7486b
--- /dev/null
+++ b/src/sleep/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-sleep',
+                'sources' : files('sleep.c'),
+        },
+]
+
+if install_sysconfdir_samples
+        install_data('sleep.conf',
+                     install_dir : pkgsysconfdir)
+endif

diff --git a/src/sysctl/meson.build b/src/sysctl/meson.build
new file mode 100644 (file)
index 0000000..1fb85c2
--- /dev/null
+++ b/src/sysctl/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-sysctl',
+                'public' : true,
+                'sources' : files('sysctl.c'),
+        },
+]

diff --git a/src/sysupdate/meson.build b/src/sysupdate/meson.build
index 1bd6bbf9a97e3ddcbcce14cbebb6ec02d05d04c5..417b47a136487956425660102245db2e4e06940c 100644 (file)
--- a/src/sysupdate/meson.build
+++ b/src/sysupdate/meson.build
@@ -2,19 +2,30 @@
 
 systemd_sysupdate_sources = files(
         'sysupdate-cache.c',
-        'sysupdate-cache.h',
         'sysupdate-instance.c',
-        'sysupdate-instance.h',
         'sysupdate-partition.c',
-        'sysupdate-partition.h',
         'sysupdate-pattern.c',
-        'sysupdate-pattern.h',
         'sysupdate-resource.c',
-        'sysupdate-resource.h',
         'sysupdate-transfer.c',
-        'sysupdate-transfer.h',
         'sysupdate-update-set.c',
-        'sysupdate-update-set.h',
         'sysupdate.c',
-        'sysupdate.h',
 )
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-sysupdate',
+                'public' : true,
+                'conditions' : ['ENABLE_SYSUPDATE'],
+                'sources' : systemd_sysupdate_sources,
+                'link_with' : [
+                        libshared,
+                        libshared_fdisk,
+                ],
+                'dependencies' : [
+                        libblkid,
+                        libfdisk,
+                        libopenssl,
+                        threads,
+                ],
+        },
+]

diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build
new file mode 100644 (file)
index 0000000..111083c
--- /dev/null
+++ b/src/vconsole/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-vconsole-setup',
+                'conditions' : ['ENABLE_VCONSOLE'],
+                'sources' : files('vconsole-setup.c'),
+        },
+]

diff --git a/src/volatile-root/meson.build b/src/volatile-root/meson.build
new file mode 100644 (file)
index 0000000..83e3628
--- /dev/null
+++ b/src/volatile-root/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-volatile-root',
+                'conditions' : ['ENABLE_INITRD'],
+                'sources' : files('volatile-root.c'),
+        },
+]