From 2d7c857d9cfcdb93e17f95826f0bf43117e859c0 Mon Sep 17 00:00:00 2001
From: Jan Janssen <medhefgo@web.de>
Date: Wed, 23 Aug 2023 14:56:41 +0200
Subject: [PATCH] meson: Simplify efi test/fuzz definitions

---
 src/boot/efi/meson.build | 85 ++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 7eee873cb0e..e35ab91402a 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -3,49 +3,48 @@
 efi_config_h_dir = meson.current_build_dir()
 efi_addon = ''
 
-if conf.get('ENABLE_BOOTLOADER') == 1
-        libefitest = static_library(
-                'efitest',
-                files(
-                        'bcd.c',
-                        'efi-string.c',
-                ),
-                build_by_default : false,
-                include_directories : [
-                        basic_includes,
-                        include_directories('.'),
-                ],
-                dependencies : userspace)
-
-        efitest_base = {
-                'link_with' : [
-                        libefitest,
-                        libshared,
-                ],
-        }
-        efi_test_template = test_template + efitest_base
-        efi_fuzz_template = fuzz_template + efitest_base
-
-        executables += [
-                efi_test_template + {
-                        'sources' : files('test-bcd.c'),
-                        'dependencies' : libzstd,
-                        'conditions' : ['HAVE_ZSTD'],
-                },
-                efi_test_template + {
-                        'sources' : files('test-efi-string.c'),
-                },
-                efi_fuzz_template + {
-                        'sources' : files('fuzz-bcd.c'),
-                },
-                efi_fuzz_template + {
-                        'sources' : files('fuzz-efi-string.c'),
-                },
-                efi_fuzz_template + {
-                        'sources' : files('fuzz-efi-printf.c'),
-                },
-        ]
-endif
+libefitest = static_library(
+        'efitest',
+        files(
+                'bcd.c',
+                'efi-string.c',
+        ),
+        build_by_default : false,
+        include_directories : [
+                basic_includes,
+                include_directories('.'),
+        ],
+        dependencies : userspace)
+
+efitest_base = {
+        'link_with' : [
+                libefitest,
+                libshared,
+        ],
+}
+efi_test_template = test_template + efitest_base
+efi_fuzz_template = fuzz_template + efitest_base
+
+executables += [
+        efi_test_template + {
+                'sources' : files('test-bcd.c'),
+                'dependencies' : libzstd,
+                'conditions' : ['ENABLE_BOOTLOADER', 'HAVE_ZSTD'],
+        },
+        efi_test_template + {
+                'sources' : files('test-efi-string.c'),
+                'conditions' : ['ENABLE_BOOTLOADER'],
+        },
+        efi_fuzz_template + {
+                'sources' : files('fuzz-bcd.c'),
+        },
+        efi_fuzz_template + {
+                'sources' : files('fuzz-efi-string.c'),
+        },
+        efi_fuzz_template + {
+                'sources' : files('fuzz-efi-printf.c'),
+        },
+]
 
 if conf.get('ENABLE_BOOTLOADER') != 1
         subdir_done()
-- 
2.47.3