[syslinux] [PATCH 4/4] efi: move clean-gnu-efi.sh to mk/efi.mk

[celelibi at gmail.com]

From: Sylvain Gault <sylvain.gault at gmail.com>

That shell script have been moved to the Makefile so that there is no
shell script anymore.

This is accompanied with a small update of gnu-efi which prevent 'make
clean' from failing.

Signed-off-by: Sylvain Gault <sylvain.gault at gmail.com>
---
 efi/Makefile         |  6 +++++-
 efi/clean-gnu-efi.sh | 37 -------------------------------------
 gnu-efi              |  2 +-
 3 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100755 efi/clean-gnu-efi.sh

diff --git a/efi/Makefile b/efi/Makefile
index 4fdcedd..beab3b4 100644
--- a/efi/Makefile
+++ b/efi/Makefile
@@ -101,7 +101,11 @@ tidy dist:
 	rm -f *.so *.o wrapper
 	find . \( -name \*.o -o -name \*.a -o -name .\*.d -o -name \*.tmp \) -print0 | \
 		xargs -0r rm -f
-	$(topdir)/efi/clean-gnu-efi.sh $(EFI_SUBARCH) $(objdir)
+	if [ -d ../gnu-efi ]; then \
+		MAKEFLAGS= make -C $(objdir)/gnu-efi SRCDIR="$(EFIDIR)" \
+			TOPDIR="$(EFIDIR)" -f "$(EFIDIR)/Makefile" \
+			ARCH=$(EFI_SUBARCH) clean; \
+	fi
 
 clean: tidy
 
diff --git a/efi/clean-gnu-efi.sh b/efi/clean-gnu-efi.sh
deleted file mode 100755
index 58def28..0000000
--- a/efi/clean-gnu-efi.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Initialise the gnu-efi submodule and ensure the source is up-to-date.
-# Then build and install it for the given architecture.
-
-if [ $# -lt 2 ]; then
-cat <<EOF
-Usage: $0: <arch> <objdir>
-
-Build the <arch> gnu-efi libs and header files and install in <objdir>.
-
-  <arch>   - A gnu-efi \$ARCH argument, i.e. ia32, x86_64
-  <objdir> - The Syslinux object directory
-
-EOF
-    exit 1
-fi
-
-ARCH="$1"
-objdir=$(readlink -f "$2")
-
-(
-	cd ../..
-	if [ -d .git ]; then
-	    git submodule update --init
-	fi
-)
-
-if [ -d "$objdir/gnu-efi" ];then
-	cd "$objdir/gnu-efi"
-	EFIDIR="$(readlink -f "$objdir/../gnu-efi/gnu-efi-3.0")"
-	make SRCDIR="$EFIDIR" TOPDIR="$EFIDIR" -f "$EFIDIR/Makefile" ARCH=$ARCH clean
-fi
-
-cd "$objdir/efi"
diff --git a/gnu-efi b/gnu-efi
index 06744d6..3cbe61f 160000
--- a/gnu-efi
+++ b/gnu-efi
@@ -1 +1 @@
-Subproject commit 06744d69273de4945cf0ffcaa4a6abf7cec707b6
+Subproject commit 3cbe61fa41898c8cbcc6be1e46cd5919fa764a77
-- 
2.5.1