From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 4 Jan 2021 11:26:20 +0000 (+0900)
Subject: meson: move source file list for systemd-cryptsetup
X-Git-Tag: v248-rc1~304^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d1892aacd64b091a9a3bdee7cfe7f743ac4ac1;p=thirdparty%2Fsystemd.git

meson: move source file list for systemd-cryptsetup
---

diff --git a/meson.build b/meson.build
index 564ef6c83d9..15bb9c59e36 100644
--- a/meson.build
+++ b/meson.build
@@ -1714,6 +1714,7 @@ subdir('src/udev')
 subdir('src/network')
 
 subdir('src/analyze')
+subdir('src/cryptsetup')
 subdir('src/journal-remote')
 subdir('src/coredump')
 subdir('src/pstore')
@@ -2321,27 +2322,6 @@ executable(
         install_dir : systemgeneratordir)
 
 if conf.get('HAVE_LIBCRYPTSETUP') == 1
-        systemd_cryptsetup_sources = files('''
-                src/cryptsetup/cryptsetup-fido2.h
-                src/cryptsetup/cryptsetup-keyfile.c
-                src/cryptsetup/cryptsetup-keyfile.h
-                src/cryptsetup/cryptsetup-pkcs11.h
-                src/cryptsetup/cryptsetup-tpm2.h
-                src/cryptsetup/cryptsetup.c
-'''.split())
-
-        if conf.get('HAVE_P11KIT') == 1
-                systemd_cryptsetup_sources += files('src/cryptsetup/cryptsetup-pkcs11.c')
-        endif
-
-        if conf.get('HAVE_LIBFIDO2') == 1
-                systemd_cryptsetup_sources += files('src/cryptsetup/cryptsetup-fido2.c')
-        endif
-
-        if conf.get('HAVE_TPM2') == 1
-                systemd_cryptsetup_sources += files('src/cryptsetup/cryptsetup-tpm2.c')
-        endif
-
         executable(
                 'systemd-cryptsetup',
                 systemd_cryptsetup_sources,
diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build
new file mode 100644
index 00000000000..26267fba510
--- /dev/null
+++ b/src/cryptsetup/meson.build
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+systemd_cryptsetup_sources = files(
+        'cryptsetup-fido2.h',
+        'cryptsetup-keyfile.c',
+        'cryptsetup-keyfile.h',
+        'cryptsetup-pkcs11.h',
+        'cryptsetup-tpm2.h',
+        'cryptsetup.c')
+
+if conf.get('HAVE_P11KIT') == 1
+        systemd_cryptsetup_sources += files('cryptsetup-pkcs11.c')
+endif
+
+if conf.get('HAVE_LIBFIDO2') == 1
+        systemd_cryptsetup_sources += files('cryptsetup-fido2.c')
+endif
+
+if conf.get('HAVE_TPM2') == 1
+        systemd_cryptsetup_sources += files('cryptsetup-tpm2.c')
+endif