2009-09-13 Robert Millan <rmh.grub@aybabtu.com>
* 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.
This commit is contained in:
parent
8ef070f50d
commit
5653217923
3 changed files with 9 additions and 22 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2009-09-13 Robert Millan <rmh.grub@aybabtu.com>
|
||||||
|
|
||||||
|
* 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 <rmh.grub@aybabtu.com>
|
2009-09-12 Robert Millan <rmh.grub@aybabtu.com>
|
||||||
|
|
||||||
* configure.ac: Bump version to 1.97~beta3.
|
* configure.ac: Bump version to 1.97~beta3.
|
||||||
|
|
|
@ -119,21 +119,14 @@ bin_UTILITIES += grub-editenv
|
||||||
grub_editenv_SOURCES = util/grub-editenv.c lib/envblk.c util/misc.c kern/misc.c kern/err.c
|
grub_editenv_SOURCES = util/grub-editenv.c lib/envblk.c util/misc.c kern/misc.c kern/err.c
|
||||||
CLEANFILES += grub-editenv
|
CLEANFILES += grub-editenv
|
||||||
|
|
||||||
# for grub-pe2elf
|
# Needed for genmk.rb to work
|
||||||
ifeq ($(enable_grub_pe2elf), yes)
|
ifeq (0,1)
|
||||||
bin_UTILITIES += grub-pe2elf
|
bin_UTILITIES += grub-macho2img grub-pe2elf
|
||||||
endif
|
endif
|
||||||
|
|
||||||
grub_pe2elf_SOURCES = util/grub-pe2elf.c util/misc.c
|
grub_pe2elf_SOURCES = util/grub-pe2elf.c util/misc.c
|
||||||
CLEANFILES += grub-pe2elf
|
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
|
grub_macho2img_SOURCES = util/grub-macho2img.c
|
||||||
CLEANFILES += grub-macho2img
|
CLEANFILES += grub-macho2img
|
||||||
|
|
||||||
|
|
12
configure.ac
12
configure.ac
|
@ -557,11 +557,6 @@ enable_grub_fstest=no
|
||||||
fi
|
fi
|
||||||
AC_SUBST([enable_grub_fstest])
|
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],
|
AC_ARG_ENABLE([grub-mkfont],
|
||||||
[AS_HELP_STRING([--enable-grub-mkfont],
|
[AS_HELP_STRING([--enable-grub-mkfont],
|
||||||
[build and install the `grub-mkfont' utility (default=guessed)])])
|
[build and install the `grub-mkfont' utility (default=guessed)])])
|
||||||
|
@ -626,13 +621,6 @@ echo With memory debugging: Yes
|
||||||
else
|
else
|
||||||
echo With memory debugging: No
|
echo With memory debugging: No
|
||||||
fi
|
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
|
if [ x"$efiemu_excuse" = x ]; then
|
||||||
echo efiemu runtime: Yes
|
echo efiemu runtime: Yes
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Reference in a new issue