From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1TzBdr-0007I2-J8 for mharc-grub-devel@gnu.org; Sat, 26 Jan 2013 14:42:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzBdl-0007G9-Th for grub-devel@gnu.org; Sat, 26 Jan 2013 14:42:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TzBdj-00016E-5a for grub-devel@gnu.org; Sat, 26 Jan 2013 14:42:13 -0500 Received: from mail-ea0-f171.google.com ([209.85.215.171]:57744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzBdi-00015u-VL for grub-devel@gnu.org; Sat, 26 Jan 2013 14:42:11 -0500 Received: by mail-ea0-f171.google.com with SMTP id c13so635863eaa.16 for ; Sat, 26 Jan 2013 11:42:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=FTTWz9wdfSFDt/kRAMfs0IoZelv3U1CsFJ6wouqnnC4=; b=X7GFgDEQSn8SUOylqJPlKGPNwOZtEuu3UJYWZgmxN4GjHXEYnor0lNJPZq3U/9utk3 meJik2kF2r/QxEPn8pzdPGGYUiACEUrgF6oF3E/vWNHaajPDb35U8jjWna1h56sFkqop vt4R7ISxvyk+aEaDYmUWgWyUrqdVdvR0onY2Xfwm4xw817+hSv0SywAwuv4cfoSd9HZH Juoym2T/wYuWvp2s0j6KZGoDZgCfScDg3lAsvskYwemKM6Y08oqQnIFjYVS8/AOumokv tTSDWUfsmb49e21ZmfXj4ZXf70aCi6chjup+oGoWVTInmQkugzOuPQoyUchgb8bk9mCZ CLlg== X-Received: by 10.14.176.66 with SMTP id a42mr33193570eem.34.1359229329565; Sat, 26 Jan 2013 11:42:09 -0800 (PST) Received: from [192.168.56.2] ([164.132.6.76]) by mx.google.com with ESMTPS id o3sm4144568eem.15.2013.01.26.11.42.07 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Jan 2013 11:42:08 -0800 (PST) Message-ID: <510431B2.9010409@gmail.com> Date: Sat, 26 Jan 2013 20:42:42 +0100 From: Francesco Lavra User-Agent: Mozilla/5.0 (X11; Linux i686; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: grub-devel@gnu.org Subject: [PATCH]: Add EFI conditional Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.215.171 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2013 19:42:19 -0000 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 * 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