From ec57a4ea49c889506075fdfab07783c4790a1724 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 25 Jun 2023 15:34:09 +0900
Subject: [PATCH] meson: move declarations of dissect and friends

---
 meson.build                        | 28 ++--------------------------
 src/dissect/meson.build            | 16 ++++++++++++++++
 src/gpt-auto-generator/meson.build | 10 ++++++++++
 3 files changed, 28 insertions(+), 26 deletions(-)
 create mode 100644 src/dissect/meson.build
 create mode 100644 src/gpt-auto-generator/meson.build

diff --git a/meson.build b/meson.build
index b495b9650d..2bff726c4a 100644
--- a/meson.build
+++ b/meson.build
@@ -2378,9 +2378,11 @@ subdir('src/coredump')
 subdir('src/cryptenroll')
 subdir('src/cryptsetup')
 subdir('src/debug-generator')
+subdir('src/dissect')
 subdir('src/environment-d-generator')
 subdir('src/fstab-generator')
 subdir('src/getty-generator')
+subdir('src/gpt-auto-generator')
 subdir('src/hibernate-resume')
 subdir('src/home')
 subdir('src/hostname')
@@ -2556,32 +2558,6 @@ if want_tests != 'false'
              depends : exe)
 endif
 
-if conf.get('HAVE_BLKID') == 1
-        executable(
-                'systemd-gpt-auto-generator',
-                'src/gpt-auto-generator/gpt-auto-generator.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libblkid,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : systemgeneratordir)
-
-        public_programs += executable(
-                'systemd-dissect',
-                'src/dissect/dissect.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [userspace],
-                install_rpath : pkglibdir,
-                install : true)
-
-        meson.add_install_script(meson_make_symlink,
-                                 bindir / 'systemd-dissect',
-                                 sbindir / 'mount.ddi')
-endif
-
 if conf.get('ENABLE_RESOLVE') == 1
         dbus_programs += executable(
                 'systemd-resolved',
diff --git a/src/dissect/meson.build b/src/dissect/meson.build
new file mode 100644
index 0000000000..742b1377bc
--- /dev/null
+++ b/src/dissect/meson.build
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-dissect',
+                'public' : true,
+                'conditions' : ['HAVE_BLKID'],
+                'sources' : files('dissect.c'),
+        },
+]
+
+if conf.get('HAVE_BLKID') == 1
+        meson.add_install_script(meson_make_symlink,
+                                 bindir / 'systemd-dissect',
+                                 sbindir / 'mount.ddi')
+endif
diff --git a/src/gpt-auto-generator/meson.build b/src/gpt-auto-generator/meson.build
new file mode 100644
index 0000000000..c7cbfbb3f3
--- /dev/null
+++ b/src/gpt-auto-generator/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        generator_template + {
+                'name' : 'systemd-gpt-auto-generator',
+                'conditions' : ['HAVE_BLKID'],
+                'sources' : files('gpt-auto-generator.c'),
+                'dependencies' : libblkid,
+        },
+]