From 5c707c8cdb624f5f02cee735ff2e3f7469c0aeb7 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 26 Jun 2023 03:23:59 +0900
Subject: [PATCH] meson: move declarations of busctl, stdio-bridge, and run

---
 meson.build                  | 29 ++---------------------------
 src/busctl/meson.build       |  8 ++++++++
 src/run/meson.build          |  9 +++++++++
 src/stdio-bridge/meson.build |  9 +++++++++
 4 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 src/run/meson.build
 create mode 100644 src/stdio-bridge/meson.build

diff --git a/meson.build b/meson.build
index ba048b598c..9be67028dc 100644
--- a/meson.build
+++ b/meson.build
@@ -2430,10 +2430,12 @@ subdir('src/reply-password')
 subdir('src/resolve')
 subdir('src/rfkill')
 subdir('src/rpm')
+subdir('src/run')
 subdir('src/run-generator')
 subdir('src/shutdown')
 subdir('src/sleep')
 subdir('src/socket-activate')
+subdir('src/stdio-bridge')
 subdir('src/sysctl')
 subdir('src/sysext')
 subdir('src/system-update-generator')
@@ -2618,33 +2620,6 @@ if want_tests != 'false'
                      systemd_id128.full_path()])
 endif
 
-public_programs += executable(
-        'systemd-run',
-        'src/run/run.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'systemd-stdio-bridge',
-        'src/stdio-bridge/stdio-bridge.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
-public_programs += executable(
-        'busctl',
-        busctl_sources,
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [userspace],
-        install_rpath : pkglibdir,
-        install : true)
-
 if enable_sysusers
         exe = executable(
                 'systemd-sysusers',
diff --git a/src/busctl/meson.build b/src/busctl/meson.build
index dce0224c39..012d58c3a8 100644
--- a/src/busctl/meson.build
+++ b/src/busctl/meson.build
@@ -5,6 +5,14 @@ busctl_sources = files(
         'busctl.c',
 )
 
+executables += [
+        executable_template + {
+                'name' : 'busctl',
+                'public' : true,
+                'sources' : busctl_sources,
+        },
+]
+
 tests += [
         {
                 'sources' : files(
diff --git a/src/run/meson.build b/src/run/meson.build
new file mode 100644
index 0000000000..597a25abeb
--- /dev/null
+++ b/src/run/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-run',
+                'public' : true,
+                'sources' : files('run.c'),
+        },
+]
diff --git a/src/stdio-bridge/meson.build b/src/stdio-bridge/meson.build
new file mode 100644
index 0000000000..99662b122e
--- /dev/null
+++ b/src/stdio-bridge/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-stdio-bridge',
+                'public' : true,
+                'sources' : files('stdio-bridge.c'),
+        },
+]