2006-12-13 Thomas Schwinge <tschwinge@gnu.org>

* Makefile.in (enable_grub_emu): New variable.
	* configure.ac (--enable-grub-emu): New option.
	Do the checks for (n)curses only if `--enable-grub-emu' is requested.
	* conf/i386-efi.rmk (sbin_UTILITIES): Add `grub-emu' only if requested.
	* conf/i386-pc.rmk: Likewise.
	* conf/powerpc-ieee1275.rmk: Likewise.
	* conf/sparc64-ieee1275.rmk (bin_UTILITIES): Likewise.
This commit is contained in:
tschwinge 2006-12-13 22:30:19 +00:00
parent a8aa57628e
commit 4fe9862ebb
7 changed files with 50 additions and 12 deletions

View file

@ -6,7 +6,10 @@ COMMON_LDFLAGS = -melf_i386 -nostdlib
# Utilities.
bin_UTILITIES = grub-mkimage
#sbin_UTILITIES = grub-setup grub-emu grub-mkdevicemap grub-probe
#sbin_UTILITIES = grub-setup grub-mkdevicemap grub-probe
#ifeq ($(enable_grub_emu), yes)
#sbin_UTILITIES += grub-emu
#endif
# For grub-mkimage.
grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \

View file

@ -51,7 +51,10 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genke
# Utilities.
bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-setup grub-emu grub-mkdevicemap grub-probe
sbin_UTILITIES = grub-setup grub-mkdevicemap grub-probe
ifeq ($(enable_grub_emu), yes)
sbin_UTILITIES += grub-emu
endif
# For grub-mkimage.
grub_mkimage_SOURCES = util/i386/pc/grub-mkimage.c util/misc.c \

View file

@ -26,7 +26,9 @@ pkgdata_PROGRAMS = kernel.elf
# Utilities.
bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-emu
ifeq ($(enable_grub_emu), yes)
sbin_UTILITIES = grub-emu
endif
# For grub-mkimage.
grub_mkimage_SOURCES = util/powerpc/ieee1275/grub-mkimage.c util/misc.c \

View file

@ -29,7 +29,10 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genke
pkgdata_PROGRAMS = kernel.elf
# Utilities.
#bin_UTILITIES = grub-emu grub-mkimage
#bin_UTILITIES = grub-mkimage
#ifeq ($(enable_grub_emu), yes)
#bin_UTILITIES += grub-emu
#endif
# For grub-mkimage.
grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \