From 9f907d305f04983c2257f821b11edcdbff81bf17 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 26 Jun 2023 03:21:42 +0900
Subject: [PATCH] meson: move declarations of cgls, cgtop, initctl, and
 systemd-mount

---
 meson.build             | 45 ++++-------------------------------------
 src/cgls/meson.build    |  9 +++++++++
 src/cgtop/meson.build   |  9 +++++++++
 src/initctl/meson.build |  9 +++++++++
 src/mount/meson.build   | 13 ++++++++++++
 5 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 src/cgls/meson.build
 create mode 100644 src/cgtop/meson.build
 create mode 100644 src/initctl/meson.build
 create mode 100644 src/mount/meson.build

diff --git a/meson.build b/meson.build
index 014eaeef1b..ba048b598c 100644
--- a/meson.build
+++ b/meson.build
@@ -2379,7 +2379,9 @@ subdir('src/binfmt')
 subdir('src/boot')
 subdir('src/boot/efi')
 subdir('src/busctl')
+subdir('src/cgls')
 subdir('src/cgroups-agent')
+subdir('src/cgtop')
 subdir('src/coredump')
 subdir('src/creds')
 subdir('src/cryptenroll')
@@ -2400,6 +2402,7 @@ subdir('src/home')
 subdir('src/hostname')
 subdir('src/id128')
 subdir('src/import')
+subdir('src/initctl')
 subdir('src/integritysetup')
 subdir('src/journal-remote')
 subdir('src/kernel-install')
@@ -2407,6 +2410,7 @@ subdir('src/locale')
 subdir('src/login')
 subdir('src/machine')
 subdir('src/machine-id-setup')
+subdir('src/mount')
 subdir('src/network')
 subdir('src/notify')
 subdir('src/nspawn')
@@ -2614,47 +2618,6 @@ if want_tests != 'false'
                      systemd_id128.full_path()])
 endif
 
-public_programs += executable(
-        'systemd-cgls',
-        'src/cgls/cgls.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-cgtop',
-        'src/cgtop/cgtop.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-executable(
-        'systemd-initctl',
-        'src/initctl/initctl.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : userspace,
-        install_rpath : pkglibdir,
-        install : (conf.get('HAVE_SYSV_COMPAT') == 1),
-        install_dir : libexecdir)
-
-public_programs += executable(
-        'systemd-mount',
-        'src/mount/mount-tool.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies: [libmount,
-                       userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-meson.add_install_script(meson_make_symlink,
-                         'systemd-mount', bindir / 'systemd-umount')
-
 public_programs += executable(
         'systemd-run',
         'src/run/run.c',
diff --git a/src/cgls/meson.build b/src/cgls/meson.build
new file mode 100644
index 0000000000..f7eea5b9d9
--- /dev/null
+++ b/src/cgls/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-cgls',
+                'public' : true,
+                'sources' : files('cgls.c'),
+        },
+]
diff --git a/src/cgtop/meson.build b/src/cgtop/meson.build
new file mode 100644
index 0000000000..afe6a33933
--- /dev/null
+++ b/src/cgtop/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-cgtop',
+                'public' : true,
+                'sources' : files('cgtop.c'),
+        },
+]
diff --git a/src/initctl/meson.build b/src/initctl/meson.build
new file mode 100644
index 0000000000..c9fddc9903
--- /dev/null
+++ b/src/initctl/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-initctl',
+                'conditions' : ['HAVE_SYSV_COMPAT'],
+                'sources' : files('initctl.c'),
+        },
+]
diff --git a/src/mount/meson.build b/src/mount/meson.build
new file mode 100644
index 0000000000..7b1af9ea57
--- /dev/null
+++ b/src/mount/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-mount',
+                'public' : true,
+                'sources' : files('mount-tool.c'),
+                'dependencies' : libmount,
+        },
+]
+
+meson.add_install_script(meson_make_symlink,
+                         'systemd-mount', bindir / 'systemd-umount')