meson: Add missing boot headers and use @INPUT@ for linking

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 0f14b9ccb75fe3937c91ac2021e43ac7f904e6f9..22485f6581f0c73fbbe3026ab6397f13a7e31350 100644 (file)
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -317,11 +317,13 @@ efi_headers = files(
         'disk.h',
         'drivers.h',
         'graphics.h',
+        'initrd.h',
         'linux.h',
         'measure.h',
         'missing_efi.h',
         'pe.h',
         'random-seed.h',
+        'secure-boot.h',
         'shim.h',
         'splash.h',
         'util.h',
@@ -404,7 +406,14 @@ foreach tuple : [['systemd_boot.so', systemd_boot_efi_name, systemd_boot_objects
                 tuple[0],
                 input : tuple[2],
                 output : tuple[0],
-                command : [cc.cmd_array(), '-o', '@OUTPUT@', efi_ldflags, efi_cflags, tuple[2], '-lefi', '-lgnuefi', '-lgcc'],
+                command : [cc.cmd_array(),
+                           '-o', '@OUTPUT@',
+                           efi_cflags,
+                           efi_ldflags,
+                           '@INPUT@',
+                           '-lefi',
+                           '-lgnuefi',
+                           '-lgcc'],
                 install : tuple[3],
                 install_dir : bootlibdir)