4e93851c0f
Use the environment context in the menu. Remove the commands "default" and "timeout", and use variables instead. * normal/menu.c: Include grub/env.h. (print_entry): Cast TITLE to silence gcc. (get_timeout): New function. (set_timeout): Likewise. (get_entry_number): Likewise. (run_menu): Use a default entry, a fallback entry and a timeout in the environment variables "default", "fallback" and "timeout". Also, tweak the default entry if it is not within the current menu entries. (grub_menu_run): Use a fallback entry in the environment variable "fallback". * normal/main.c (read_config_file): Do not initialize NEWMENU->DEFAULT_ENTRY, NEWMENU->FALLBACK_ENTRY or NEWMENU->TIMEOUT. (grub_normal_execute): Use a data slot to store the menu. * include/grub/normal.h (struct grub_menu): Removed default_entry, fallback_entry and timeout. (struct grub_menu_list): Removed. (grub_menu_list_t): Likewise. (struct grub_context): Likewise. (grub_context_t): Likewise. (grub_context_get): Likewise. (grub_context_get_current_menu): Likewise. (grub_context_push_menu): Likewise. (grub_context_pop_menu): Likewise. (grub_default_init): Likewise. (grub_default_fini): Likewise. (grub_timeout_init): Likewise. (grub_timeout_fini): Likewise. * conf/sparc64-ieee1275.rmk (pkgdata_MODULES): Removed default.mod and timeout.mod. (normal_mod_SOURCES): Removed normal/context.c. * conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Removed commands/default.c, commands/timeout.c and normal/context.c. (normal_mod_SOURCES): Removed normal/context.c. * conf/i386-pc.rmk (grub_emu_SOURCES): Removed commands/default.c, commands/timeout.c and normal/context.c. (normal_mod_SOURCES): Removed normal/context.c. * conf/i386-efi.rmk (grub_emu_SOURCES): Removed commands/default.c, commands/timeout.c and normal/context.c. (normal_mod_SOURCES): Removed normal/context.c. * conf/common.rmk (pkgdata_MODULES): Removed default.mod and timeout.mod. (default_mod_SOURCES): Removed. (default_mod_CFLAGS): Likewise. (default_mod_LDFLAGS): Likewise. (timeout_mod_SOURCES): Removed. (timeout_mod_CFLAGS): Likewise. (timeout_mod_LDFLAGS): Likewise. * DISTLIST: Removed commands/default.c, commands/timeout.c and normal/context.c. * commands/default.c: Removed. * commands/timeout.c: Likewise. * normal/context.c: Likewise.
202 lines
5.1 KiB
Makefile
202 lines
5.1 KiB
Makefile
# -*- makefile -*-
|
|
|
|
# For the parser.
|
|
grub_script.tab.c grub_script.tab.h: normal/parser.y
|
|
$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
|
|
DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
|
|
|
|
# For grub-emu.
|
|
grub_modules_init.lst: geninit.sh
|
|
(cd $(srcdir); find . -name '*.c' -printf "%P\n" | xargs grep GRUB_MOD_INIT) > $@
|
|
DISTCLEANFILES += grub_modules_init.lst
|
|
|
|
grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
|
|
sh $(srcdir)/geninitheader.sh > $@
|
|
DISTCLEANFILES += grub_modules_init.h
|
|
|
|
grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
|
|
sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
|
|
DISTCLEANFILES += grub_emu_init.c
|
|
|
|
|
|
# Filing systems.
|
|
pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod \
|
|
minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod affs.mod \
|
|
sfs.mod hfsplus.mod
|
|
|
|
# For fshelp.mod.
|
|
fshelp_mod_SOURCES = fs/fshelp.c
|
|
fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For fat.mod.
|
|
fat_mod_SOURCES = fs/fat.c
|
|
fat_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For ufs.mod.
|
|
ufs_mod_SOURCES = fs/ufs.c
|
|
ufs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For ext2.mod.
|
|
ext2_mod_SOURCES = fs/ext2.c
|
|
ext2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For minix.mod.
|
|
minix_mod_SOURCES = fs/minix.c
|
|
minix_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For hfs.mod.
|
|
hfs_mod_SOURCES = fs/hfs.c
|
|
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For jfs.mod.
|
|
jfs_mod_SOURCES = fs/jfs.c
|
|
jfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For iso9660.mod.
|
|
iso9660_mod_SOURCES = fs/iso9660.c
|
|
iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For xfs.mod.
|
|
xfs_mod_SOURCES = fs/xfs.c
|
|
xfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For affs.mod.
|
|
affs_mod_SOURCES = fs/affs.c
|
|
affs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For sfs.mod.
|
|
sfs_mod_SOURCES = fs/sfs.c
|
|
sfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For hfsplus.mod.
|
|
hfsplus_mod_SOURCES = fs/hfsplus.c
|
|
hfsplus_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# Partition maps.
|
|
pkgdata_MODULES += amiga.mod apple.mod pc.mod sun.mod acorn.mod gpt.mod
|
|
|
|
# For amiga.mod
|
|
amiga_mod_SOURCES = partmap/amiga.c
|
|
amiga_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For apple.mod
|
|
apple_mod_SOURCES = partmap/apple.c
|
|
apple_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For pc.mod
|
|
pc_mod_SOURCES = partmap/pc.c
|
|
pc_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For sun.mod
|
|
sun_mod_SOURCES = partmap/sun.c
|
|
sun_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For acorn.mod
|
|
acorn_mod_SOURCES = partmap/acorn.c
|
|
acorn_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For gpt.mod
|
|
gpt_mod_SOURCES = partmap/gpt.c
|
|
gpt_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
gpt_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
# Commands.
|
|
pkgdata_MODULES += hello.mod boot.mod terminal.mod ls.mod \
|
|
cmp.mod cat.mod help.mod font.mod search.mod \
|
|
loopback.mod configfile.mod \
|
|
terminfo.mod test.mod
|
|
|
|
# For hello.mod.
|
|
hello_mod_SOURCES = hello/hello.c
|
|
hello_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For boot.mod.
|
|
boot_mod_SOURCES = commands/boot.c
|
|
boot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For terminal.mod.
|
|
terminal_mod_SOURCES = commands/terminal.c
|
|
terminal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For ls.mod.
|
|
ls_mod_SOURCES = commands/ls.c
|
|
ls_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For cmp.mod.
|
|
cmp_mod_SOURCES = commands/cmp.c
|
|
cmp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For cat.mod.
|
|
cat_mod_SOURCES = commands/cat.c
|
|
cat_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For help.mod.
|
|
help_mod_SOURCES = commands/help.c
|
|
help_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
help_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For font.mod.
|
|
font_mod_SOURCES = font/manager.c
|
|
font_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
font_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For search.mod.
|
|
search_mod_SOURCES = commands/search.c
|
|
search_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
search_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For test.mod.
|
|
test_mod_SOURCES = commands/test.c
|
|
test_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
test_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For loopback.mod
|
|
loopback_mod_SOURCES = disk/loopback.c
|
|
loopback_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For configfile.mod
|
|
configfile_mod_SOURCES = commands/configfile.c
|
|
configfile_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
# For terminfo.mod.
|
|
terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
|
|
terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
# Misc.
|
|
pkgdata_MODULES += gzio.mod
|
|
|
|
# For gzio.mod.
|
|
gzio_mod_SOURCES = io/gzio.c
|
|
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|