meson: move declarations of random-seed, vconsole, and sysupdate

diff --git a/meson.build b/meson.build
index 898f3d4b462c1bf4767ad11b503ccaa6ac90e542..f94889b09a8e394e519a1b44b25f6e9ce3616ecf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2405,6 +2405,7 @@ subdir('src/oom')
 subdir('src/partition')
 subdir('src/portable')
 subdir('src/pstore')
+subdir('src/random-seed')
 subdir('src/rc-local-generator')
 subdir('src/resolve')
 subdir('src/rfkill')
@@ -2422,6 +2423,7 @@ subdir('src/timesync')
 subdir('src/tmpfiles')
 subdir('src/user-sessions')
 subdir('src/userdb')
+subdir('src/vconsole')
 subdir('src/veritysetup')
 subdir('src/xdg-autostart-generator')
 
@@ -2582,48 +2584,6 @@ meson.add_install_script(meson_make_symlink,
                          bindir / 'udevadm',
                          libexecdir / 'systemd-udevd')
 
-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',

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/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'),
+        },
+]