From 4a7ee0a5217ab963c12704dbff428c43d9df81f0 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Tue, 24 Jan 2023 15:14:15 +0100 Subject: meson: Do not include headers in source lists Meson+ninja+compiler do this for us and are better at it. https://mesonbuild.com/FAQ.html#do-i-need-to-add-my-headers-to-the-sources-list-like-in-autotools --- src/cryptsetup/cryptsetup-tokens/meson.build | 8 +++----- src/cryptsetup/meson.build | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/cryptsetup') diff --git a/src/cryptsetup/cryptsetup-tokens/meson.build b/src/cryptsetup/cryptsetup-tokens/meson.build index 42c29f100e..9df3fea5d7 100644 --- a/src/cryptsetup/cryptsetup-tokens/meson.build +++ b/src/cryptsetup/cryptsetup-tokens/meson.build @@ -5,8 +5,6 @@ cryptsetup_token_sym_path = meson.current_source_dir() / 'cryptsetup-token.sym' lib_cryptsetup_token_common = static_library( 'cryptsetup-token-common', - 'cryptsetup-token.h', - 'cryptsetup-token-util.h', 'cryptsetup-token-util.c', include_directories : includes, link_with : libshared, @@ -15,14 +13,14 @@ lib_cryptsetup_token_common = static_library( cryptsetup_token_systemd_tpm2_sources = files( 'cryptsetup-token-systemd-tpm2.c', 'luks2-tpm2.c', - 'luks2-tpm2.h') +) cryptsetup_token_systemd_fido2_sources = files( 'cryptsetup-token-systemd-fido2.c', 'luks2-fido2.c', - 'luks2-fido2.h') +) cryptsetup_token_systemd_pkcs11_sources = files( 'cryptsetup-token-systemd-pkcs11.c', 'luks2-pkcs11.c', - 'luks2-pkcs11.h') +) diff --git a/src/cryptsetup/meson.build b/src/cryptsetup/meson.build index ba8e01a198..45c4154c95 100644 --- a/src/cryptsetup/meson.build +++ b/src/cryptsetup/meson.build @@ -2,10 +2,8 @@ systemd_cryptsetup_sources = files( 'cryptsetup-keyfile.c', - 'cryptsetup-keyfile.h', - 'cryptsetup-pkcs11.h', - 'cryptsetup-tpm2.h', - 'cryptsetup.c') + 'cryptsetup.c', +) if conf.get('HAVE_P11KIT') == 1 systemd_cryptsetup_sources += files('cryptsetup-pkcs11.c') -- cgit v1.2.1