meson: move declarations of cryptsetup and friends

diff --git a/meson.build b/meson.build
index eb00b228f9f614e2c18e7ef737cd867e822cdc52..eca9b4325c33a34a0688b14c3376e19d1468d305 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2388,6 +2388,7 @@ subdir('src/hibernate-resume')
 subdir('src/home')
 subdir('src/hostname')
 subdir('src/import')
+subdir('src/integritysetup')
 subdir('src/journal-remote')
 subdir('src/kernel-install')
 subdir('src/locale')
@@ -2418,6 +2419,7 @@ subdir('src/timesync')
 subdir('src/tmpfiles')
 subdir('src/user-sessions')
 subdir('src/userdb')
+subdir('src/veritysetup')
 subdir('src/xdg-autostart-generator')
 
 subdir('src/systemd')
@@ -2577,86 +2579,6 @@ meson.add_install_script(meson_make_symlink,
                          bindir / 'udevadm',
                          libexecdir / 'systemd-udevd')
 
-if conf.get('HAVE_LIBCRYPTSETUP') == 1
-        executable(
-                'systemd-cryptsetup',
-                systemd_cryptsetup_sources,
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libcryptsetup,
-                                libopenssl,
-                                libp11kit,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        executable(
-                'systemd-cryptsetup-generator',
-                'src/cryptsetup/cryptsetup-generator.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : systemgeneratordir)
-
-        executable(
-                'systemd-veritysetup',
-                'src/veritysetup/veritysetup.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libcryptsetup,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        executable(
-                'systemd-veritysetup-generator',
-                'src/veritysetup/veritysetup-generator.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : systemgeneratordir)
-
-        public_programs += executable(
-                'systemd-cryptenroll',
-                systemd_cryptenroll_sources,
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libcryptsetup,
-                                libdl,
-                                libopenssl,
-                                libp11kit,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true)
-
-        executable(
-                'systemd-integritysetup',
-                ['src/integritysetup/integritysetup.c', 'src/integritysetup/integrity-util.c'],
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [libcryptsetup,
-                                userspace],
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-
-        executable(
-                'systemd-integritysetup-generator',
-                ['src/integritysetup/integritysetup-generator.c', 'src/integritysetup/integrity-util.c'],
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : systemgeneratordir)
-endif
-
 if conf.get('HAVE_SYSV_COMPAT') == 1
         exe = executable(
                 'systemd-sysv-generator',

diff --git a/src/cryptenroll/meson.build b/src/cryptenroll/meson.build
index 9080af0db9bc0d8598f78eda773e6555b9d068dd..fa171ea47a565d78e2d1f438b2a0b6f252c29dc1 100644 (file)
--- a/src/cryptenroll/meson.build
+++ b/src/cryptenroll/meson.build
@@ -19,3 +19,18 @@ endif
 if conf.get('HAVE_TPM2') == 1
         systemd_cryptenroll_sources += files('cryptenroll-tpm2.c')
 endif
+
+executables += [
+        executable_template + {
+                'name' : 'systemd-cryptenroll',
+                'public' : true,
+                'conditions' : ['HAVE_LIBCRYPTSETUP'],
+                'sources' : systemd_cryptenroll_sources,
+                'dependencies' : [
+                        libcryptsetup,
+                        libdl,
+                        libopenssl,
+                        libp11kit,
+                ],
+        },
+]

diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build
index 2a8e43a33a4a9bf6bd3ba3d346e57369f23ec93f..6f7aa3c796d6f8acabb179cd04299942427e6e45 100644 (file)
--- a/src/cryptsetup/meson.build
+++ b/src/cryptsetup/meson.build
@@ -14,3 +14,21 @@ endif
 if conf.get('HAVE_TPM2') == 1
         systemd_cryptsetup_sources += files('cryptsetup-tpm2.c')
 endif
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-cryptsetup',
+                'conditions' : ['HAVE_LIBCRYPTSETUP'],
+                'sources' : systemd_cryptsetup_sources,
+                'dependencies' : [
+                        libcryptsetup,
+                        libopenssl,
+                        libp11kit,
+                ],
+        },
+        generator_template + {
+                'name' : 'systemd-cryptsetup-generator',
+                'conditions' : ['HAVE_LIBCRYPTSETUP'],
+                'sources' : files('cryptsetup-generator.c'),
+        },
+]

diff --git a/src/integritysetup/meson.build b/src/integritysetup/meson.build
new file mode 100644 (file)
index 0000000..6b9d78d
--- /dev/null
+++ b/src/integritysetup/meson.build
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-integritysetup',
+                'conditions' : ['HAVE_LIBCRYPTSETUP'],
+                'sources' : files(
+                        'integrity-util.c',
+                        'integritysetup.c',
+                ),
+                'dependencies' : libcryptsetup,
+        },
+        generator_template + {
+                'name' : 'systemd-integritysetup-generator',
+                'conditions' : ['HAVE_LIBCRYPTSETUP'],
+                'sources' : files(
+                        'integrity-util.c',
+                        'integritysetup-generator.c',
+                ),
+        },
+]

diff --git a/src/veritysetup/meson.build b/src/veritysetup/meson.build
new file mode 100644 (file)
index 0000000..a7468df
--- /dev/null
+++ b/src/veritysetup/meson.build
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-veritysetup',
+                'conditions' : ['HAVE_LIBCRYPTSETUP'],
+                'sources' : files('veritysetup.c'),
+                'dependencies' : libcryptsetup,
+        },
+        generator_template + {
+                'name' : 'systemd-veritysetup-generator',
+                'conditions' : ['HAVE_LIBCRYPTSETUP'],
+                'sources' : files('veritysetup-generator.c'),
+        },
+]