From e2bdf00a228126630d2b95702164aef58102cd51 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 25 Jun 2023 16:34:27 +0900
Subject: [PATCH] meson: move declarations of cgroups-agent, id128,
 volatile-root, and path

---
 meson.build                   | 44 ++++-------------------------------
 src/cgroups-agent/meson.build |  8 +++++++
 src/id128/meson.build         |  9 +++++++
 src/path/meson.build          |  9 +++++++
 src/volatile-root/meson.build |  9 +++++++
 5 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 src/cgroups-agent/meson.build
 create mode 100644 src/id128/meson.build
 create mode 100644 src/path/meson.build
 create mode 100644 src/volatile-root/meson.build

diff --git a/meson.build b/meson.build
index d9987f3d77..acab81df4c 100644
--- a/meson.build
+++ b/meson.build
@@ -2378,6 +2378,7 @@ 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')
@@ -2396,6 +2397,7 @@ 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')
@@ -2413,6 +2415,7 @@ 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')
@@ -2438,6 +2441,7 @@ 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')
@@ -2597,38 +2601,9 @@ meson.add_install_script(meson_make_symlink,
                          bindir / 'udevadm',
                          libexecdir / 'systemd-udevd')
 
-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
@@ -2636,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',
diff --git a/src/cgroups-agent/meson.build b/src/cgroups-agent/meson.build
new file mode 100644
index 0000000000..33ff1f55fd
--- /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/id128/meson.build b/src/id128/meson.build
new file mode 100644
index 0000000000..13798aed93
--- /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/path/meson.build b/src/path/meson.build
new file mode 100644
index 0000000000..70d3dd0cfd
--- /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/volatile-root/meson.build b/src/volatile-root/meson.build
new file mode 100644
index 0000000000..83e36288ef
--- /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'),
+        },
+]