[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2593] 2009-09-13 Robert Millan <address@hidden>
From: |
Robert Millan |
Subject: |
[2593] 2009-09-13 Robert Millan <address@hidden> |
Date: |
Sun, 13 Sep 2009 01:30:19 +0000 |
Revision: 2593
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2593
Author: robertmh
Date: 2009-09-13 01:30:18 +0000 (Sun, 13 Sep 2009)
Log Message:
-----------
2009-09-13 Robert Millan <address@hidden>
* configure.ac: Remove --enable-grub-pe2elf. Only build
grub-pe2elf when needed by the build system itself.
* conf/common.rmk: Remove $(enable_grub_pe2elf) check.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/common.rmk
trunk/grub2/configure.ac
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-09-12 13:09:32 UTC (rev 2592)
+++ trunk/grub2/ChangeLog 2009-09-13 01:30:18 UTC (rev 2593)
@@ -1,3 +1,9 @@
+2009-09-13 Robert Millan <address@hidden>
+
+ * configure.ac: Remove --enable-grub-pe2elf. Only build
+ grub-pe2elf when needed by the build system itself.
+ * conf/common.rmk: Remove $(enable_grub_pe2elf) check.
+
2009-09-12 Robert Millan <address@hidden>
* configure.ac: Bump version to 1.97~beta3.
Modified: trunk/grub2/conf/common.rmk
===================================================================
--- trunk/grub2/conf/common.rmk 2009-09-12 13:09:32 UTC (rev 2592)
+++ trunk/grub2/conf/common.rmk 2009-09-13 01:30:18 UTC (rev 2593)
@@ -119,21 +119,14 @@
grub_editenv_SOURCES = util/grub-editenv.c lib/envblk.c util/misc.c
kern/misc.c kern/err.c
CLEANFILES += grub-editenv
-# for grub-pe2elf
-ifeq ($(enable_grub_pe2elf), yes)
-bin_UTILITIES += grub-pe2elf
+# Needed for genmk.rb to work
+ifeq (0,1)
+bin_UTILITIES += grub-macho2img grub-pe2elf
endif
grub_pe2elf_SOURCES = util/grub-pe2elf.c util/misc.c
CLEANFILES += grub-pe2elf
-# grub_macho2img assumes a lot about source file.
-# So installing it definitively is useless
-# But adding to bin_UTILITIES is needed for
-# genmk.rb to work
-ifeq (0,1)
-bin_UTILITIES += grub-macho2img
-endif
grub_macho2img_SOURCES = util/grub-macho2img.c
CLEANFILES += grub-macho2img
Modified: trunk/grub2/configure.ac
===================================================================
--- trunk/grub2/configure.ac 2009-09-12 13:09:32 UTC (rev 2592)
+++ trunk/grub2/configure.ac 2009-09-13 01:30:18 UTC (rev 2593)
@@ -557,11 +557,6 @@
fi
AC_SUBST([enable_grub_fstest])
-AC_ARG_ENABLE([grub-pe2elf],
- [AS_HELP_STRING([--enable-grub-pe2elf],
- [build and install the `grub-pe2elf' conversion
utility])])
-AC_SUBST([enable_grub_pe2elf])
-
AC_ARG_ENABLE([grub-mkfont],
[AS_HELP_STRING([--enable-grub-mkfont],
[build and install the `grub-mkfont' utility
(default=guessed)])])
@@ -626,13 +621,6 @@
else
echo With memory debugging: No
fi
-if [ x"$enable_grub_pe2elf" = xyes ]; then
-echo grub-pe2elf will be built and installed
-elif [ x$TARGET_OBJ2ELF = xgrub-pe2elf ]; then
-echo grub-pe2elf will be built but not installed
-else
-echo grub-pe2elf will not be built
-fi
if [ x"$efiemu_excuse" = x ]; then
echo efiemu runtime: Yes
else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2593] 2009-09-13 Robert Millan <address@hidden>,
Robert Millan <=