[PATCH]: Add EFI conditional

[Francesco Lavra]

This patch adds the automake conditional COND_efi, which is true for
every configuration using the EFI platform. This conditional is used in
grub-core/Makefile.am to remove some duplicated entries in
KERNEL_HEADER_FILES.
As the EFI platform is expected to be used in more architectures (work
is in progress to port GRUB to ARM using EFI), this patch will allow
not to have even more duplicated code in the future.

2013-01-26  Francesco Lavra  <address@hidden>

        * configure.ac (COND_efi): New condition.
        * grub-core/Makefile.am (KERNEL_HEADER_FILES): Add EFI files under
        COND_efi and remove duplicated entries.

=== modified file 'configure.ac'
--- configure.ac        2013-01-12 13:30:37 +0000
+++ configure.ac        2013-01-26 19:33:43 +0000
@@ -1132,6 +1132,7 @@
 #
 
 AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
+AM_CONDITIONAL([COND_efi], [test x$platform = xefi])
 AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
 AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = 
xefi])
 AM_CONDITIONAL([COND_ia64_efi], [test x$target_cpu = xia64 -a x$platform = 
xefi])

=== modified file 'grub-core/Makefile.am'
--- grub-core/Makefile.am       2012-10-12 13:04:02 +0000
+++ grub-core/Makefile.am       2013-01-26 19:38:28 +0000
@@ -102,8 +102,6 @@
 endif
 
 if COND_i386_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
 endif
@@ -132,17 +130,10 @@
 endif
 
 if COND_x86_64_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
 endif
 
-if COND_ia64_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-endif
-
 if COND_mips
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/kernel.h
 endif
@@ -225,6 +216,11 @@
 endif
 endif
 
+if COND_efi
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+endif
+
 symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
        @list='$^'; \
        for p in $$list; do \

--
Francesco Lavra