From fdad22a1ed0cefcc975f9f6d2a6153d3b47bc78a Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 14 Sep 2015 23:29:24 +0100
Subject: [PATCH] [efi] Minimise use of iPXE header files when building host
 utilities

Avoid dragging in unnecessary iPXE header files such as <ipxe/uuid.h>
and <ipxe/tables.h> when building host utilities, and ensure that
FILE_LICENCE() (present in the imported EDK2 headers) expands to a
no-op.

Reported-by: Michael Tautschnig <mt@debian.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/util/efifatbin.c | 3 ++-
 src/util/efirom.c    | 3 ++-
 src/util/elf2efi.c   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/util/efifatbin.c b/src/util/efifatbin.c
index c02f750b..918e7a3c 100644
--- a/src/util/efifatbin.c
+++ b/src/util/efifatbin.c
@@ -17,6 +17,7 @@
  * 02110-1301, USA.
  */
 
+#define FILE_LICENCE(...) extern void __file_licence ( void )
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -27,7 +28,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <getopt.h>
-#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Uefi.h>
 #include <ipxe/efi/IndustryStandard/PeImage.h>
 
 #define eprintf(...) fprintf ( stderr, __VA_ARGS__ )
diff --git a/src/util/efirom.c b/src/util/efirom.c
index abee496d..a982c19a 100644
--- a/src/util/efirom.c
+++ b/src/util/efirom.c
@@ -17,6 +17,7 @@
  * 02110-1301, USA.
  */
 
+#define FILE_LICENCE(...) extern void __file_licence ( void )
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -27,7 +28,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <getopt.h>
-#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Uefi.h>
 #include <ipxe/efi/IndustryStandard/PeImage.h>
 #include <ipxe/efi/IndustryStandard/Pci22.h>
 
diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
index 4d2de3e7..bf6dae05 100644
--- a/src/util/elf2efi.c
+++ b/src/util/elf2efi.c
@@ -20,6 +20,7 @@
 #define _GNU_SOURCE
 #define PACKAGE "elf2efi"
 #define PACKAGE_VERSION "1"
+#define FILE_LICENCE(...) extern void __file_licence ( void )
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -30,7 +31,7 @@
 #include <assert.h>
 #include <getopt.h>
 #include <bfd.h>
-#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Uefi.h>
 #include <ipxe/efi/IndustryStandard/PeImage.h>
 #include <libgen.h>