[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[1990] 2009-02-13 Colin D Bennett <address@hidden>
From: |
Colin Bennett |
Subject: |
[1990] 2009-02-13 Colin D Bennett <address@hidden> |
Date: |
Fri, 13 Feb 2009 20:06:28 +0000 |
Revision: 1990
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1990
Author: cbennett
Date: 2009-02-13 20:06:27 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
2009-02-13 Colin D Bennett <address@hidden>
Support multiple fallback entries, and provide an API to support
executing default+fallback menu entries. Renamed the `terminal' menu
viewer to `text'.
* include/grub/normal.h (grub_normal_text_menu_viewer): New global
variable declaration.
(grub_menu_execute_callback): New structure declaration.
(grub_menu_execute_callback_t): New typedef.
(grub_menu_execute_with_fallback): New function declaration.
(grub_menu_get_entry): Likewise.
(grub_menu_get_timeout): Likewise.
(grub_menu_set_timeout): Likewise.
* normal/main.c (GRUB_MOD_INIT(normal)): Refer to new variable name.
* normal/menu.c (grub_wait_after_message): Moved to
`normal/menu_text.c'.
(draw_border): Likewise.
(print_message): Likewise.
(print_entry): Likewise.
(print_entries): Likewise.
(grub_menu_init_page): Likewise.
(get_entry_number): Likewise.
(print_timeout): Likewise.
(run_menu): Likewise.
(grub_menu_execute_entry): Likewise.
(show_text_menu): Likewise.
(get_and_remove_first_entry_number): New function.
(grub_menu_execute_with_fallback): Likewise.
(get_entry): Renamed to ...
(grub_menu_get_entry): .. this and made it global.
(get_timeout): Renamed to ...
(grub_menu_get_timeout): ... this and made it global.
(set_timeout): Renamed to ...
(grub_menu_set_timeout): ... this and made it global.
(grub_normal_terminal_menu_viewer): Renamed to ...
(grub_normal_text_menu_viewer): ... this.
* normal/menu_text.c: New file. Extracted text-menu-specific code
from normal/menu.c.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add `normal/menu_text.c'.
(normal_mod_SOURCES): Likewise.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
* conf/i386-pc.rmk, (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/i386-coreboot.mk
trunk/grub2/conf/i386-coreboot.rmk
trunk/grub2/conf/i386-efi.mk
trunk/grub2/conf/i386-efi.rmk
trunk/grub2/conf/i386-ieee1275.mk
trunk/grub2/conf/i386-ieee1275.rmk
trunk/grub2/conf/i386-pc.mk
trunk/grub2/conf/i386-pc.rmk
trunk/grub2/conf/powerpc-ieee1275.mk
trunk/grub2/conf/powerpc-ieee1275.rmk
trunk/grub2/conf/sparc64-ieee1275.mk
trunk/grub2/conf/sparc64-ieee1275.rmk
trunk/grub2/conf/x86_64-efi.mk
trunk/grub2/conf/x86_64-efi.rmk
trunk/grub2/include/grub/normal.h
trunk/grub2/normal/main.c
trunk/grub2/normal/menu.c
Added Paths:
-----------
trunk/grub2/normal/menu_text.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/ChangeLog 2009-02-13 20:06:27 UTC (rev 1990)
@@ -1,3 +1,67 @@
+2009-02-13 Colin D Bennett <address@hidden>
+
+ Support multiple fallback entries, and provide an API to support
+ executing default+fallback menu entries. Renamed the `terminal' menu
+ viewer to `text'.
+
+ * include/grub/normal.h (grub_normal_text_menu_viewer): New global
+ variable declaration.
+ (grub_menu_execute_callback): New structure declaration.
+ (grub_menu_execute_callback_t): New typedef.
+ (grub_menu_execute_with_fallback): New function declaration.
+ (grub_menu_get_entry): Likewise.
+ (grub_menu_get_timeout): Likewise.
+ (grub_menu_set_timeout): Likewise.
+
+ * normal/main.c (GRUB_MOD_INIT(normal)): Refer to new variable name.
+
+ * normal/menu.c (grub_wait_after_message): Moved to
+ `normal/menu_text.c'.
+ (draw_border): Likewise.
+ (print_message): Likewise.
+ (print_entry): Likewise.
+ (print_entries): Likewise.
+ (grub_menu_init_page): Likewise.
+ (get_entry_number): Likewise.
+ (print_timeout): Likewise.
+ (run_menu): Likewise.
+ (grub_menu_execute_entry): Likewise.
+ (show_text_menu): Likewise.
+ (get_and_remove_first_entry_number): New function.
+ (grub_menu_execute_with_fallback): Likewise.
+ (get_entry): Renamed to ...
+ (grub_menu_get_entry): .. this and made it global.
+ (get_timeout): Renamed to ...
+ (grub_menu_get_timeout): ... this and made it global.
+ (set_timeout): Renamed to ...
+ (grub_menu_set_timeout): ... this and made it global.
+ (grub_normal_terminal_menu_viewer): Renamed to ...
+ (grub_normal_text_menu_viewer): ... this.
+
+ * normal/menu_text.c: New file. Extracted text-menu-specific code
+ from normal/menu.c.
+
+ * conf/i386-coreboot.rmk (grub_emu_SOURCES): Add `normal/menu_text.c'.
+ (normal_mod_SOURCES): Likewise.
+
+ * conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
+ (normal_mod_SOURCES): Likewise.
+
+ * conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+ (normal_mod_SOURCES): Likewise.
+
+ * conf/i386-pc.rmk, (grub_emu_SOURCES): Likewise.
+ (normal_mod_SOURCES): Likewise.
+
+ * conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+ (normal_mod_SOURCES): Likewise.
+
+ * conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+ (normal_mod_SOURCES): Likewise.
+
+ * conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
+ (normal_mod_SOURCES): Likewise.
+
2009-02-11 Robert Millan <address@hidden>
* util/grub.d/00_header.in: Update old reference to `font' command.
Modified: trunk/grub2/conf/i386-coreboot.mk
===================================================================
--- trunk/grub2/conf/i386-coreboot.mk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/i386-coreboot.mk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -195,7 +195,7 @@
lib/hexdump.c commands/i386/cpuid.c \
disk/host.c disk/loopback.c \
\
- fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
+ fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/xfs.c fs/afs.c fs/tar.c \
@@ -208,7 +208,7 @@
kern/loader.c kern/main.c kern/misc.c kern/parser.c \
grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c \
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
- normal/completion.c normal/main.c \
+ normal/completion.c normal/main.c normal/menu_text.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
normal/misc.c normal/script.c \
normal/color.c \
@@ -221,11 +221,11 @@
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d
grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d
grub_emu-commands_test.d grub_emu-commands_search.d
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d
grub_emu-lib_hexdump.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d
grub_emu-disk_loopback.d grub_emu-fs_affs.d grub_emu-fs_cpio.d
grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d
grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d grub_emu-fs_minix.d
grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d grub_emu-fs_reiserfs.d
grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-fs_afs.d
grub_emu-fs_tar.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d
grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d
grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d
grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d
grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d
grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d
grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d
grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d
grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_hostfs.d
grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_hostdisk.d
grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-disk_raid.d
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d
grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d
grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d
grub_emu-commands_test.d grub_emu-commands_search.d
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d
grub_emu-lib_hexdump.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d
grub_emu-disk_loopback.d grub_emu-fs_affs.d grub_emu-fs_cpio.d
grub_emu-fs_fat.d grub_emu-fs_ext2.d grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d
grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d grub_emu-fs_minix.d
grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d grub_emu-fs_reiserfs.d
grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-fs_afs.d
grub_emu-fs_tar.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d
grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d
grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d
grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d
grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d
grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d
grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d
grub_emu-normal_menu_text.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d
grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_hostfs.d
grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_hostdisk.d
grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-disk_raid.d
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d
grub_emu-grub_emu_init.d
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o
- $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o
grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o
grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o
+ $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o
grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o
grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o
grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
grub_emu-commands_boot.o: commands/boot.c $(commands/boot.c_DEPENDENCIES)
$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -299,14 +299,14 @@
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_cpio.d
+grub_emu-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
+ $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-fs_fat.d
+
grub_emu-fs_ext2.o: fs/ext2.c $(fs/ext2.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_ext2.d
-grub_emu-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
- $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
--include grub_emu-fs_fat.d
-
grub_emu-fs_hfs.o: fs/hfs.c $(fs/hfs.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_hfs.d
@@ -467,6 +467,10 @@
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-normal_main.d
+grub_emu-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-normal_menu_text.d
+
grub_emu-normal_menu.o: normal/menu.c $(normal/menu.c_DEPENDENCIES)
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-normal_menu.d
@@ -716,17 +720,18 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
normal/script.c \
normal/i386/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o und-normal.lst
ifneq ($(normal_mod_EXPORTS),no)
CLEANFILES += def-normal.lst
DEFSYMFILES += def-normal.lst
endif
-MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d
normal_mod-grub_script_tab.d normal_mod-normal_script.d
normal_mod-normal_i386_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_menu_text.d normal_mod-normal_color.d
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d
normal_mod-normal_misc.d normal_mod-grub_script_tab.d
normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
UNDSYMFILES += und-normal.lst
normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -735,9 +740,9 @@
if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f
$@; exit 1); fi
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o
-rm -f $@
- $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o
mod-normal.o: mod-normal.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS)
-c -o $@ $<
@@ -925,6 +930,25 @@
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+normal_mod-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_menu_text.d
+
+CLEANFILES += cmd-normal_mod-normal_menu_text.lst
fs-normal_mod-normal_menu_text.lst partmap-normal_mod-normal_menu_text.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_text.lst
+FSFILES += fs-normal_mod-normal_menu_text.lst
+PARTMAPFILES += partmap-normal_mod-normal_menu_text.lst
+
+cmd-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
normal_mod-normal_color.o: normal/color.c $(normal/color.c_DEPENDENCIES)
$(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
-include normal_mod-normal_color.d
Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/i386-coreboot.rmk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -75,7 +75,7 @@
kern/loader.c kern/main.c kern/misc.c kern/parser.c \
grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c \
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
- normal/completion.c normal/main.c \
+ normal/completion.c normal/main.c normal/menu_text.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
normal/misc.c normal/script.c \
normal/color.c \
@@ -123,6 +123,7 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
Modified: trunk/grub2/conf/i386-efi.mk
===================================================================
--- trunk/grub2/conf/i386-efi.mk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/i386-efi.mk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -87,6 +87,7 @@
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
normal/completion.c normal/context.c normal/main.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
+ normal/menu_text.c \
normal/misc.c normal/script.c \
normal/color.c \
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
@@ -743,17 +744,18 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
normal/script.c \
normal/i386/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o und-normal.lst
ifneq ($(normal_mod_EXPORTS),no)
CLEANFILES += def-normal.lst
DEFSYMFILES += def-normal.lst
endif
-MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d
normal_mod-grub_script_tab.d normal_mod-normal_script.d
normal_mod-normal_i386_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_menu_text.d normal_mod-normal_color.d
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d
normal_mod-normal_misc.d normal_mod-grub_script_tab.d
normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
UNDSYMFILES += und-normal.lst
normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -762,9 +764,9 @@
if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f
$@; exit 1); fi
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o
-rm -f $@
- $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o
mod-normal.o: mod-normal.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS)
-c -o $@ $<
@@ -952,6 +954,25 @@
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+normal_mod-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_menu_text.d
+
+CLEANFILES += cmd-normal_mod-normal_menu_text.lst
fs-normal_mod-normal_menu_text.lst partmap-normal_mod-normal_menu_text.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_text.lst
+FSFILES += fs-normal_mod-normal_menu_text.lst
+PARTMAPFILES += partmap-normal_mod-normal_menu_text.lst
+
+cmd-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
normal_mod-normal_color.o: normal/color.c $(normal/color.c_DEPENDENCIES)
$(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
-include normal_mod-normal_color.d
Modified: trunk/grub2/conf/i386-efi.rmk
===================================================================
--- trunk/grub2/conf/i386-efi.rmk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/i386-efi.rmk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -54,6 +54,7 @@
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
normal/completion.c normal/context.c normal/main.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
+ normal/menu_text.c \
normal/misc.c normal/script.c \
normal/color.c \
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
@@ -120,6 +121,7 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
Modified: trunk/grub2/conf/i386-ieee1275.mk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.mk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/i386-ieee1275.mk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -194,7 +194,7 @@
commands/i386/cpuid.c \
disk/host.c disk/loopback.c \
\
- fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
+ fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/xfs.c fs/afs.c fs/tar.c \
@@ -207,7 +207,7 @@
kern/loader.c kern/main.c kern/misc.c kern/parser.c \
grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c \
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
- normal/completion.c normal/main.c \
+ normal/completion.c normal/main.c normal/menu_text.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
normal/misc.c normal/script.c \
normal/color.c \
@@ -220,11 +220,11 @@
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d
grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d
grub_emu-commands_test.d grub_emu-commands_search.d
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d
grub_emu-lib_hexdump.d grub_emu-commands_halt.d grub_emu-commands_reboot.d
grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d grub_emu-disk_loopback.d
grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_ext2.d grub_emu-fs_fat.d
grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d
grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d
grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d
grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d
grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d
grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d
grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d
grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d
grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d
grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_hostfs.d
grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_hostdisk.d
grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-disk_raid.d
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d
grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d
grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d
grub_emu-commands_test.d grub_emu-commands_search.d
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d
grub_emu-lib_hexdump.d grub_emu-commands_halt.d grub_emu-commands_reboot.d
grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d grub_emu-disk_loopback.d
grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d
grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d
grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-fs_fshelp.d grub_emu-io_gzio.d
grub_emu-kern_device.d grub_emu-kern_disk.d grub_emu-kern_dl.d
grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d
grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d
grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d
grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d
grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d
grub_emu-normal_menu_text.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d
grub_emu-partmap_gpt.d grub_emu-util_console.d grub_emu-util_hostfs.d
grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_hostdisk.d
grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d grub_emu-disk_raid.d
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d
grub_emu-grub_emu_init.d
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o
- $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o
grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o
grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o
+ $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o
grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o
grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o grub_emu-disk_loopback.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-fs_fshelp.o grub_emu-io_gzio.o
grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_dl.o
grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_menu_text.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-util_hostfs.o
grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_hostdisk.o
grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_emu_init.o $(LDFLAGS) $(grub_emu_LDFLAGS)
grub_emu-commands_boot.o: commands/boot.c $(commands/boot.c_DEPENDENCIES)
$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -306,14 +306,14 @@
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_cpio.d
+grub_emu-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
+ $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-fs_fat.d
+
grub_emu-fs_ext2.o: fs/ext2.c $(fs/ext2.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_ext2.d
-grub_emu-fs_fat.o: fs/fat.c $(fs/fat.c_DEPENDENCIES)
- $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
--include grub_emu-fs_fat.d
-
grub_emu-fs_hfs.o: fs/hfs.c $(fs/hfs.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_hfs.d
@@ -474,6 +474,10 @@
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-normal_main.d
+grub_emu-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-normal_menu_text.d
+
grub_emu-normal_menu.o: normal/menu.c $(normal/menu.c_DEPENDENCIES)
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-normal_menu.d
@@ -610,17 +614,18 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
normal/script.c \
normal/i386/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o und-normal.lst
ifneq ($(normal_mod_EXPORTS),no)
CLEANFILES += def-normal.lst
DEFSYMFILES += def-normal.lst
endif
-MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d
normal_mod-grub_script_tab.d normal_mod-normal_script.d
normal_mod-normal_i386_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_menu_text.d normal_mod-normal_color.d
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d
normal_mod-normal_misc.d normal_mod-grub_script_tab.d
normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
UNDSYMFILES += und-normal.lst
normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -629,9 +634,9 @@
if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f
$@; exit 1); fi
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o
-rm -f $@
- $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o
mod-normal.o: mod-normal.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS)
-c -o $@ $<
@@ -819,6 +824,25 @@
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+normal_mod-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_menu_text.d
+
+CLEANFILES += cmd-normal_mod-normal_menu_text.lst
fs-normal_mod-normal_menu_text.lst partmap-normal_mod-normal_menu_text.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_text.lst
+FSFILES += fs-normal_mod-normal_menu_text.lst
+PARTMAPFILES += partmap-normal_mod-normal_menu_text.lst
+
+cmd-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
normal_mod-normal_color.o: normal/color.c $(normal/color.c_DEPENDENCIES)
$(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
-include normal_mod-normal_color.d
Modified: trunk/grub2/conf/i386-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.rmk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/i386-ieee1275.rmk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -74,7 +74,7 @@
kern/loader.c kern/main.c kern/misc.c kern/parser.c \
grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c \
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
- normal/completion.c normal/main.c \
+ normal/completion.c normal/main.c normal/menu_text.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
normal/misc.c normal/script.c \
normal/color.c \
@@ -113,6 +113,7 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
Modified: trunk/grub2/conf/i386-pc.mk
===================================================================
--- trunk/grub2/conf/i386-pc.mk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/i386-pc.mk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -537,6 +537,7 @@
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
normal/completion.c normal/main.c normal/color.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
+ normal/menu_text.c \
normal/misc.c normal/script.c \
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
partmap/acorn.c partmap/gpt.c \
@@ -553,11 +554,11 @@
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d
grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d
grub_emu-commands_test.d grub_emu-commands_search.d
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d
grub_emu-lib_hexdump.d grub_emu-commands_i386_pc_halt.d
grub_emu-commands_reboot.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d
grub_emu-disk_loopback.d grub_emu-disk_scsi.d grub_emu-fs_fshelp.d
grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d
grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d
grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d
grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d
grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d
grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d
grub_emu-normal_color.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-partmap_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d
grub_emu-partmap_sun.d grub_emu-partmap_acorn.d grub_emu-partmap_gpt.d
grub_emu-fs_affs.d grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d
grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d
grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-util_console.d
grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d
grub_emu-util_hostdisk.d grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d
grub_emu-disk_raid.d grub_emu-disk_raid5_recover.d
grub_emu-disk_raid6_recover.d grub_emu-disk_mdraid_linux.d
grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_echo.d
grub_emu-commands_help.d grub_emu-commands_terminal.d grub_emu-commands_ls.d
grub_emu-commands_test.d grub_emu-commands_search.d
grub_emu-commands_blocklist.d grub_emu-commands_hexdump.d
grub_emu-lib_hexdump.d grub_emu-commands_i386_pc_halt.d
grub_emu-commands_reboot.d grub_emu-commands_i386_cpuid.d grub_emu-disk_host.d
grub_emu-disk_loopback.d grub_emu-disk_scsi.d grub_emu-fs_fshelp.d
grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d
grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d grub_emu-kern_err.d
grub_emu-normal_execute.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-normal_lexer.d grub_emu-kern_loader.d grub_emu-kern_main.d
grub_emu-kern_misc.d grub_emu-kern_parser.d grub_emu-grub_script_tab.d
grub_emu-kern_partition.d grub_emu-kern_rescue.d grub_emu-kern_term.d
grub_emu-normal_arg.d grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_function.d grub_emu-normal_completion.d grub_emu-normal_main.d
grub_emu-normal_color.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_menu_text.d
grub_emu-normal_misc.d grub_emu-normal_script.d grub_emu-partmap_amiga.d
grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d
grub_emu-partmap_acorn.d grub_emu-partmap_gpt.d grub_emu-fs_affs.d
grub_emu-fs_cpio.d grub_emu-fs_fat.d grub_emu-fs_ext2.d grub_emu-fs_hfs.d
grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d
grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-util_console.d
grub_emu-util_hostfs.d grub_emu-util_grub_emu.d grub_emu-util_misc.d
grub_emu-util_hostdisk.d grub_emu-util_getroot.d grub_emu-util_i386_pc_misc.d
grub_emu-disk_raid.d grub_emu-disk_raid5_recover.d
grub_emu-disk_raid6_recover.d grub_emu-disk_mdraid_linux.d
grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d grub_emu-grub_emu_init.d
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
- $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o
grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o
grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o
grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o
grub_emu-fs_affs.o grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
$(LDFLAGS) $(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_echo.o grub_emu-commands_help.o grub_emu-commands_terminal.o
grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
+ $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_echo.o
grub_emu-commands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o
grub_emu-commands_test.o grub_emu-commands_search.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_i386_pc_halt.o
grub_emu-commands_reboot.o grub_emu-commands_i386_cpuid.o grub_emu-disk_host.o
grub_emu-disk_loopback.o grub_emu-disk_scsi.o grub_emu-fs_fshelp.o
grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o
grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o grub_emu-kern_err.o
grub_emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-normal_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o
grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-grub_script_tab.o
grub_emu-kern_partition.o grub_emu-kern_rescue.o grub_emu-kern_term.o
grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_function.o grub_emu-normal_completion.o grub_emu-normal_main.o
grub_emu-normal_color.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_menu_text.o
grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o
grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o
grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-fs_affs.o
grub_emu-fs_cpio.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-util_console.o
grub_emu-util_hostfs.o grub_emu-util_grub_emu.o grub_emu-util_misc.o
grub_emu-util_hostdisk.o grub_emu-util_getroot.o grub_emu-util_i386_pc_misc.o
grub_emu-disk_raid.o grub_emu-disk_raid5_recover.o
grub_emu-disk_raid6_recover.o grub_emu-disk_mdraid_linux.o
grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o grub_emu-grub_emu_init.o
$(LDFLAGS) $(grub_emu_LDFLAGS)
grub_emu-commands_boot.o: commands/boot.c $(commands/boot.c_DEPENDENCIES)
$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -755,6 +756,10 @@
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-normal_menu_viewer.d
+grub_emu-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-normal_menu_text.d
+
grub_emu-normal_misc.o: normal/misc.c $(normal/misc.c_DEPENDENCIES)
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-normal_misc.d
@@ -1273,17 +1278,18 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
normal/script.c \
normal/i386/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o und-normal.lst
ifneq ($(normal_mod_EXPORTS),no)
CLEANFILES += def-normal.lst
DEFSYMFILES += def-normal.lst
endif
-MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d
normal_mod-grub_script_tab.d normal_mod-normal_script.d
normal_mod-normal_i386_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_menu_text.d normal_mod-normal_color.d
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d
normal_mod-normal_misc.d normal_mod-grub_script_tab.d
normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
UNDSYMFILES += und-normal.lst
normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -1292,9 +1298,9 @@
if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f
$@; exit 1); fi
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o
-rm -f $@
- $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_i386_setjmp.o
+ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_i386_setjmp.o
mod-normal.o: mod-normal.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS)
-c -o $@ $<
@@ -1482,6 +1488,25 @@
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+normal_mod-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_menu_text.d
+
+CLEANFILES += cmd-normal_mod-normal_menu_text.lst
fs-normal_mod-normal_menu_text.lst partmap-normal_mod-normal_menu_text.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_text.lst
+FSFILES += fs-normal_mod-normal_menu_text.lst
+PARTMAPFILES += partmap-normal_mod-normal_menu_text.lst
+
+cmd-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
normal_mod-normal_color.o: normal/color.c $(normal/color.c_DEPENDENCIES)
$(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
-include normal_mod-normal_color.d
Modified: trunk/grub2/conf/i386-pc.rmk
===================================================================
--- trunk/grub2/conf/i386-pc.rmk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/i386-pc.rmk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -130,6 +130,7 @@
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
normal/completion.c normal/main.c normal/color.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
+ normal/menu_text.c \
normal/misc.c normal/script.c \
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
partmap/acorn.c partmap/gpt.c \
@@ -210,6 +211,7 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
Modified: trunk/grub2/conf/powerpc-ieee1275.mk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.mk 2009-02-11 00:36:58 UTC (rev
1989)
+++ trunk/grub2/conf/powerpc-ieee1275.mk 2009-02-13 20:06:27 UTC (rev
1990)
@@ -60,7 +60,7 @@
lib/hexdump.c commands/halt.c commands/reboot.c \
disk/loopback.c \
\
- fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
+ fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/ext2.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/xfs.c fs/afs.c fs/tar.c \
@@ -73,6 +73,7 @@
normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/menu_entry.c normal/menu_viewer.c normal/misc.c \
normal/script.c \
normal/color.c \
@@ -85,11 +86,11 @@
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
grub_script.tab.c grub_emu_init.c
-CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_help.o grub_emu-commands_search.o
grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o
grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o
grub_emu-kern_term.o grub_emu-fs_fshelp.o grub_emu-normal_arg.o
grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_completion.o grub_emu-normal_execute.o
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
-MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_help.d
grub_emu-commands_search.d grub_emu-commands_terminal.d
grub_emu-commands_test.d grub_emu-commands_ls.d grub_emu-commands_blocklist.d
grub_emu-commands_hexdump.d grub_emu-lib_hexdump.d grub_emu-commands_halt.d
grub_emu-commands_reboot.d grub_emu-disk_loopback.d grub_emu-fs_affs.d
grub_emu-fs_cpio.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_hfs.d
grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d grub_emu-fs_jfs.d
grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-io_gzio.d grub_emu-kern_device.d
grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d
grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d
grub_emu-kern_parser.d grub_emu-kern_partition.d grub_emu-kern_rescue.d
grub_emu-kern_term.d grub_emu-fs_fshelp.d grub_emu-normal_arg.d
grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_completion.d grub_emu-normal_execute.d
grub_emu-normal_function.d grub_emu-normal_lexer.d grub_emu-normal_main.d
grub_emu-normal_menu.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d
grub_emu-util_console.d grub_emu-util_hostfs.d grub_emu-util_grub_emu.d
grub_emu-util_misc.d grub_emu-util_hostdisk.d grub_emu-util_getroot.d
grub_emu-util_powerpc_ieee1275_misc.d grub_emu-disk_raid.d
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d
grub_emu-grub_script_tab.d grub_emu-grub_emu_init.d
+CLEANFILES += grub-emu$(EXEEXT) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_help.o grub_emu-commands_search.o
grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o
grub_emu-kern_term.o grub_emu-fs_fshelp.o grub_emu-normal_arg.o
grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_completion.o grub_emu-normal_execute.o
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_text.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
+MOSTLYCLEANFILES += grub_emu-commands_boot.d grub_emu-commands_cat.d
grub_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_help.d
grub_emu-commands_search.d grub_emu-commands_terminal.d
grub_emu-commands_test.d grub_emu-commands_ls.d grub_emu-commands_blocklist.d
grub_emu-commands_hexdump.d grub_emu-lib_hexdump.d grub_emu-commands_halt.d
grub_emu-commands_reboot.d grub_emu-disk_loopback.d grub_emu-fs_affs.d
grub_emu-fs_cpio.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_ext2.d
grub_emu-fs_hfs.d grub_emu-fs_hfsplus.d grub_emu-fs_iso9660.d grub_emu-fs_udf.d
grub_emu-fs_jfs.d grub_emu-fs_minix.d grub_emu-fs_ntfs.d grub_emu-fs_ntfscomp.d
grub_emu-fs_reiserfs.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d
grub_emu-fs_afs.d grub_emu-fs_tar.d grub_emu-io_gzio.d grub_emu-kern_device.d
grub_emu-kern_disk.d grub_emu-kern_dl.d grub_emu-kern_elf.d grub_emu-kern_env.d
grub_emu-kern_err.d grub_emu-kern_file.d grub_emu-kern_fs.d
grub_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d
grub_emu-kern_parser.d grub_emu-kern_partition.d grub_emu-kern_rescue.d
grub_emu-kern_term.d grub_emu-fs_fshelp.d grub_emu-normal_arg.d
grub_emu-normal_cmdline.d grub_emu-normal_command.d
grub_emu-normal_completion.d grub_emu-normal_execute.d
grub_emu-normal_function.d grub_emu-normal_lexer.d grub_emu-normal_main.d
grub_emu-normal_menu.d grub_emu-normal_menu_text.d grub_emu-normal_menu_entry.d
grub_emu-normal_menu_viewer.d grub_emu-normal_misc.d grub_emu-normal_script.d
grub_emu-normal_color.d grub_emu-partmap_amiga.d grub_emu-partmap_apple.d
grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_acorn.d
grub_emu-util_console.d grub_emu-util_hostfs.d grub_emu-util_grub_emu.d
grub_emu-util_misc.d grub_emu-util_hostdisk.d grub_emu-util_getroot.d
grub_emu-util_powerpc_ieee1275_misc.d grub_emu-disk_raid.d
grub_emu-disk_raid5_recover.d grub_emu-disk_raid6_recover.d
grub_emu-disk_mdraid_linux.d grub_emu-disk_dmraid_nvidia.d grub_emu-disk_lvm.d
grub_emu-grub_script_tab.d grub_emu-grub_emu_init.d
-grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_help.o grub_emu-commands_search.o
grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o
grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o grub_emu-fs_minix.o
grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o grub_emu-fs_reiserfs.o
grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_afs.o
grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o
grub_emu-kern_term.o grub_emu-fs_fshelp.o grub_emu-normal_arg.o
grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_completion.o grub_emu-normal_execute.o
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
- $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o
grub_emu-commands_search.o grub_emu-commands_terminal.o
grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o
grub_emu-commands_hexdump.o grub_emu-lib_hexdump.o grub_emu-commands_halt.o
grub_emu-commands_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o
grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_hfs.o
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o
grub_emu-kern_term.o grub_emu-fs_fshelp.o grub_emu-normal_arg.o
grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_completion.o grub_emu-normal_execute.o
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o $(LDFLAGS)
$(grub_emu_LDFLAGS)
+grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o
grub_emu-commands_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o
grub_emu-commands_help.o grub_emu-commands_search.o
grub_emu-commands_terminal.o grub_emu-commands_test.o grub_emu-commands_ls.o
grub_emu-commands_blocklist.o grub_emu-commands_hexdump.o
grub_emu-lib_hexdump.o grub_emu-commands_halt.o grub_emu-commands_reboot.o
grub_emu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_cpio.o
grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_ext2.o grub_emu-fs_hfs.o
grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o grub_emu-fs_jfs.o
grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o
grub_emu-kern_term.o grub_emu-fs_fshelp.o grub_emu-normal_arg.o
grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_completion.o grub_emu-normal_execute.o
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_text.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o
+ $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o
grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o
grub_emu-commands_search.o grub_emu-commands_terminal.o
grub_emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o
grub_emu-commands_hexdump.o grub_emu-lib_hexdump.o grub_emu-commands_halt.o
grub_emu-commands_reboot.o grub_emu-disk_loopback.o grub_emu-fs_affs.o
grub_emu-fs_cpio.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_ext2.o
grub_emu-fs_hfs.o grub_emu-fs_hfsplus.o grub_emu-fs_iso9660.o grub_emu-fs_udf.o
grub_emu-fs_jfs.o grub_emu-fs_minix.o grub_emu-fs_ntfs.o grub_emu-fs_ntfscomp.o
grub_emu-fs_reiserfs.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o
grub_emu-fs_afs.o grub_emu-fs_tar.o grub_emu-io_gzio.o grub_emu-kern_device.o
grub_emu-kern_disk.o grub_emu-kern_dl.o grub_emu-kern_elf.o grub_emu-kern_env.o
grub_emu-kern_err.o grub_emu-kern_file.o grub_emu-kern_fs.o
grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o
grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o
grub_emu-kern_term.o grub_emu-fs_fshelp.o grub_emu-normal_arg.o
grub_emu-normal_cmdline.o grub_emu-normal_command.o
grub_emu-normal_completion.o grub_emu-normal_execute.o
grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o
grub_emu-normal_menu.o grub_emu-normal_menu_text.o grub_emu-normal_menu_entry.o
grub_emu-normal_menu_viewer.o grub_emu-normal_misc.o grub_emu-normal_script.o
grub_emu-normal_color.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o
grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o
grub_emu-util_console.o grub_emu-util_hostfs.o grub_emu-util_grub_emu.o
grub_emu-util_misc.o grub_emu-util_hostdisk.o grub_emu-util_getroot.o
grub_emu-util_powerpc_ieee1275_misc.o grub_emu-disk_raid.o
grub_emu-disk_raid5_recover.o grub_emu-disk_raid6_recover.o
grub_emu-disk_mdraid_linux.o grub_emu-disk_dmraid_nvidia.o grub_emu-disk_lvm.o
grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o $(LDFLAGS)
$(grub_emu_LDFLAGS)
grub_emu-commands_boot.o: commands/boot.c $(commands/boot.c_DEPENDENCIES)
$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_emu_CFLAGS) -MD -c -o $@ $<
@@ -167,6 +168,10 @@
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_fat.d
+grub_emu-fs_ext2.o: fs/ext2.c $(fs/ext2.c_DEPENDENCIES)
+ $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-fs_ext2.d
+
grub_emu-fs_hfs.o: fs/hfs.c $(fs/hfs.c_DEPENDENCIES)
$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-fs_hfs.d
@@ -327,6 +332,10 @@
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-normal_menu.d
+grub_emu-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
+-include grub_emu-normal_menu_text.d
+
grub_emu-normal_menu_entry.o: normal/menu_entry.c
$(normal/menu_entry.c_DEPENDENCIES)
$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_emu_CFLAGS) -MD -c -o $@ $<
-include grub_emu-normal_menu_entry.d
@@ -724,17 +733,18 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
normal/script.c \
normal/powerpc/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_powerpc_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_powerpc_setjmp.o und-normal.lst
ifneq ($(normal_mod_EXPORTS),no)
CLEANFILES += def-normal.lst
DEFSYMFILES += def-normal.lst
endif
-MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d
normal_mod-grub_script_tab.d normal_mod-normal_script.d
normal_mod-normal_powerpc_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_menu_text.d normal_mod-normal_color.d
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d
normal_mod-normal_misc.d normal_mod-grub_script_tab.d
normal_mod-normal_script.d normal_mod-normal_powerpc_setjmp.d
UNDSYMFILES += und-normal.lst
normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -743,9 +753,9 @@
if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f
$@; exit 1); fi
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_powerpc_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_powerpc_setjmp.o
-rm -f $@
- $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_powerpc_setjmp.o
+ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_powerpc_setjmp.o
mod-normal.o: mod-normal.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS)
-c -o $@ $<
@@ -933,6 +943,25 @@
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+normal_mod-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_menu_text.d
+
+CLEANFILES += cmd-normal_mod-normal_menu_text.lst
fs-normal_mod-normal_menu_text.lst partmap-normal_mod-normal_menu_text.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_text.lst
+FSFILES += fs-normal_mod-normal_menu_text.lst
+PARTMAPFILES += partmap-normal_mod-normal_menu_text.lst
+
+cmd-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
normal_mod-normal_color.o: normal/color.c $(normal/color.c_DEPENDENCIES)
$(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
-include normal_mod-normal_color.d
Modified: trunk/grub2/conf/powerpc-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.rmk 2009-02-11 00:36:58 UTC (rev
1989)
+++ trunk/grub2/conf/powerpc-ieee1275.rmk 2009-02-13 20:06:27 UTC (rev
1990)
@@ -58,6 +58,7 @@
normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/menu_entry.c normal/menu_viewer.c normal/misc.c \
normal/script.c \
normal/color.c \
@@ -133,6 +134,7 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
Modified: trunk/grub2/conf/sparc64-ieee1275.mk
===================================================================
--- trunk/grub2/conf/sparc64-ieee1275.mk 2009-02-11 00:36:58 UTC (rev
1989)
+++ trunk/grub2/conf/sparc64-ieee1275.mk 2009-02-13 20:06:27 UTC (rev
1990)
@@ -49,7 +49,7 @@
# commands/timeout.c commands/test.c \
# commands/halt.c commands/reboot.c \
# disk/loopback.c \
-# fs/affs.c fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c \
+# fs/affs.c fs/fat.c fs/ext2.c fs/fshelp.c fs/hfs.c fs/iso9660.c \
# fs/jfs.c fs/minix.c fs/sfs.c fs/ufs.c fs/xfs.c \
# grub_script.tab.c \
# io/gzio.c \
@@ -60,6 +60,7 @@
# normal/completion.c normal/context.c normal/execute.c \
# normal/function.c normal/lexer.c \
# normal/main.c normal/menu.c normal/menu_entry.c \
+# normal/menu_text.c \
# normal/menu_viewer.c normal/misc.c \
# partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
# partmap/acorn.c \
@@ -793,17 +794,18 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
normal/script.c \
normal/sparc64/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_sparc64_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_sparc64_setjmp.o und-normal.lst
ifneq ($(normal_mod_EXPORTS),no)
CLEANFILES += def-normal.lst
DEFSYMFILES += def-normal.lst
endif
-MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d
normal_mod-grub_script_tab.d normal_mod-normal_script.d
normal_mod-normal_sparc64_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_menu_text.d normal_mod-normal_color.d
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d
normal_mod-normal_misc.d normal_mod-grub_script_tab.d
normal_mod-normal_script.d normal_mod-normal_sparc64_setjmp.d
UNDSYMFILES += und-normal.lst
normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -812,9 +814,9 @@
if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f
$@; exit 1); fi
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_sparc64_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_sparc64_setjmp.o
-rm -f $@
- $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_sparc64_setjmp.o
+ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_sparc64_setjmp.o
mod-normal.o: mod-normal.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS)
-c -o $@ $<
@@ -1002,6 +1004,25 @@
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+normal_mod-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_menu_text.d
+
+CLEANFILES += cmd-normal_mod-normal_menu_text.lst
fs-normal_mod-normal_menu_text.lst partmap-normal_mod-normal_menu_text.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_text.lst
+FSFILES += fs-normal_mod-normal_menu_text.lst
+PARTMAPFILES += partmap-normal_mod-normal_menu_text.lst
+
+cmd-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
normal_mod-normal_color.o: normal/color.c $(normal/color.c_DEPENDENCIES)
$(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
-include normal_mod-normal_color.d
Modified: trunk/grub2/conf/sparc64-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/sparc64-ieee1275.rmk 2009-02-11 00:36:58 UTC (rev
1989)
+++ trunk/grub2/conf/sparc64-ieee1275.rmk 2009-02-13 20:06:27 UTC (rev
1990)
@@ -59,6 +59,7 @@
# normal/completion.c normal/context.c normal/execute.c \
# normal/function.c normal/lexer.c \
# normal/main.c normal/menu.c normal/menu_entry.c \
+# normal/menu_text.c \
# normal/menu_viewer.c normal/misc.c \
# partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
# partmap/acorn.c \
@@ -166,6 +167,7 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
Modified: trunk/grub2/conf/x86_64-efi.mk
===================================================================
--- trunk/grub2/conf/x86_64-efi.mk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/x86_64-efi.mk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -61,7 +61,7 @@
commands/i386/cpuid.c \
disk/loopback.c \
\
- fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
+ fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
fs/ufs.c fs/xfs.c fs/afs.c \
@@ -75,6 +75,7 @@
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
normal/completion.c normal/context.c normal/main.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
+ normal/menu_text.c \
normal/misc.c normal/script.c \
normal/color.c \
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
@@ -750,17 +751,18 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
normal/script.c \
normal/x86_64/setjmp.S
-CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_x86_64_setjmp.o und-normal.lst
+CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_x86_64_setjmp.o und-normal.lst
ifneq ($(normal_mod_EXPORTS),no)
CLEANFILES += def-normal.lst
DEFSYMFILES += def-normal.lst
endif
-MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_color.d normal_mod-normal_menu_viewer.d
normal_mod-normal_menu_entry.d normal_mod-normal_misc.d
normal_mod-grub_script_tab.d normal_mod-normal_script.d
normal_mod-normal_x86_64_setjmp.d
+MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d
normal_mod-normal_command.d normal_mod-normal_completion.d
normal_mod-normal_execute.d normal_mod-normal_function.d
normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d
normal_mod-normal_menu_text.d normal_mod-normal_color.d
normal_mod-normal_menu_viewer.d normal_mod-normal_menu_entry.d
normal_mod-normal_misc.d normal_mod-grub_script_tab.d
normal_mod-normal_script.d normal_mod-normal_x86_64_setjmp.d
UNDSYMFILES += und-normal.lst
normal.mod: pre-normal.o mod-normal.o $(TARGET_OBJ2ELF)
@@ -769,9 +771,9 @@
if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f
$@; exit 1); fi
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_x86_64_setjmp.o
+pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o
normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_x86_64_setjmp.o
-rm -f $@
- $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_color.o
normal_mod-normal_menu_viewer.o normal_mod-normal_menu_entry.o
normal_mod-normal_misc.o normal_mod-grub_script_tab.o
normal_mod-normal_script.o normal_mod-normal_x86_64_setjmp.o
+ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@
normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o
normal_mod-normal_completion.o normal_mod-normal_execute.o
normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o
normal_mod-normal_menu.o normal_mod-normal_menu_text.o
normal_mod-normal_color.o normal_mod-normal_menu_viewer.o
normal_mod-normal_menu_entry.o normal_mod-normal_misc.o
normal_mod-grub_script_tab.o normal_mod-normal_script.o
normal_mod-normal_x86_64_setjmp.o
mod-normal.o: mod-normal.c
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS)
-c -o $@ $<
@@ -959,6 +961,25 @@
set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+normal_mod-normal_menu_text.o: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES)
+ $(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
+-include normal_mod-normal_menu_text.d
+
+CLEANFILES += cmd-normal_mod-normal_menu_text.lst
fs-normal_mod-normal_menu_text.lst partmap-normal_mod-normal_menu_text.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_text.lst
+FSFILES += fs-normal_mod-normal_menu_text.lst
+PARTMAPFILES += partmap-normal_mod-normal_menu_text.lst
+
+cmd-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) gencmdlist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
+
+fs-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genfslist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
+
+partmap-normal_mod-normal_menu_text.lst: normal/menu_text.c
$(normal/menu_text.c_DEPENDENCIES) genpartmaplist.sh
+ set -e; $(TARGET_CC) -Inormal -I$(srcdir)/normal
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -E $< | sh
$(srcdir)/genpartmaplist.sh normal > $@ || (rm -f $@; exit 1)
+
+
normal_mod-normal_color.o: normal/color.c $(normal/color.c_DEPENDENCIES)
$(TARGET_CC) -Inormal -I$(srcdir)/normal $(TARGET_CPPFLAGS)
$(TARGET_CFLAGS) $(normal_mod_CFLAGS) -MD -c -o $@ $<
-include normal_mod-normal_color.d
Modified: trunk/grub2/conf/x86_64-efi.rmk
===================================================================
--- trunk/grub2/conf/x86_64-efi.rmk 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/conf/x86_64-efi.rmk 2009-02-13 20:06:27 UTC (rev 1990)
@@ -56,6 +56,7 @@
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
normal/completion.c normal/context.c normal/main.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
+ normal/menu_text.c \
normal/misc.c normal/script.c \
normal/color.c \
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
@@ -122,6 +123,7 @@
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
normal/completion.c normal/execute.c \
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
+ normal/menu_text.c \
normal/color.c \
normal/menu_viewer.c normal/menu_entry.c \
normal/misc.c grub_script.tab.c \
Modified: trunk/grub2/include/grub/normal.h
===================================================================
--- trunk/grub2/include/grub/normal.h 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/include/grub/normal.h 2009-02-13 20:06:27 UTC (rev 1990)
@@ -79,7 +79,7 @@
/* The name of a module. Used for auto-loading. */
char *module_name;
-
+
/* The next element. */
struct grub_command *next;
};
@@ -96,12 +96,39 @@
/* To exit from the normal mode. */
extern grub_jmp_buf grub_exit_env;
-extern struct grub_menu_viewer grub_normal_terminal_menu_viewer;
+extern struct grub_menu_viewer grub_normal_text_menu_viewer;
+/* Callback structure menu viewers can use to provide user feedback when
+ default entries are executed, possibly including fallback entries. */
+typedef struct grub_menu_execute_callback
+{
+ /* Called immediately before ENTRY is booted. */
+ void (*notify_booting) (grub_menu_entry_t entry, void *userdata);
+
+ /* Called when executing one entry has failed, and another entry, ENTRY, will
+ be executed as a fallback. The implementation of this function should
+ delay for a period of at least 2 seconds before returning in order to
+ allow the user time to read the information before it can be lost by
+ executing ENTRY. */
+ void (*notify_fallback) (grub_menu_entry_t entry, void *userdata);
+
+ /* Called when an entry has failed to execute and there is no remaining
+ fallback entry to attempt. */
+ void (*notify_failure) (void *userdata);
+}
+*grub_menu_execute_callback_t;
+
void grub_enter_normal_mode (const char *config);
void grub_normal_execute (const char *config, int nested);
+void grub_menu_execute_with_fallback (grub_menu_t menu,
+ grub_menu_entry_t entry,
+ grub_menu_execute_callback_t callback,
+ void *callback_data);
void grub_menu_entry_run (grub_menu_entry_t entry);
void grub_menu_execute_entry(grub_menu_entry_t entry);
+grub_menu_entry_t grub_menu_get_entry (grub_menu_t menu, int no);
+int grub_menu_get_timeout (void);
+void grub_menu_set_timeout (int timeout);
void grub_cmdline_run (int nested);
int grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
int echo_char, int readline);
Modified: trunk/grub2/normal/main.c
===================================================================
--- trunk/grub2/normal/main.c 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/normal/main.c 2009-02-13 20:06:27 UTC (rev 1990)
@@ -620,7 +620,7 @@
if (mod)
grub_dl_ref (mod);
- grub_menu_viewer_register (&grub_normal_terminal_menu_viewer);
+ grub_menu_viewer_register (&grub_normal_text_menu_viewer);
grub_set_history (GRUB_DEFAULT_HISTORY_SIZE);
Modified: trunk/grub2/normal/menu.c
===================================================================
--- trunk/grub2/normal/menu.c 2009-02-11 00:36:58 UTC (rev 1989)
+++ trunk/grub2/normal/menu.c 2009-02-13 20:06:27 UTC (rev 1990)
@@ -1,3 +1,4 @@
+/* menu.c - General supporting functionality for menus. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2003,2004,2005,2006,2007,2008,2009 Free Software
Foundation, Inc.
@@ -17,7 +18,6 @@
*/
#include <grub/normal.h>
-#include <grub/term.h>
#include <grub/misc.h>
#include <grub/loader.h>
#include <grub/mm.h>
@@ -26,84 +26,10 @@
#include <grub/script.h>
#include <grub/menu_viewer.h>
-static grub_uint8_t grub_color_menu_normal;
-static grub_uint8_t grub_color_menu_highlight;
-
-/* Wait until the user pushes any key so that the user
- can see what happened. */
-void
-grub_wait_after_message (void)
+/* Get a menu entry by its index in the entry list. */
+grub_menu_entry_t
+grub_menu_get_entry (grub_menu_t menu, int no)
{
- grub_printf ("\nPress any key to continue...");
- (void) grub_getkey ();
-}
-
-static void
-draw_border (void)
-{
- unsigned i;
-
- grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
-
- grub_gotoxy (GRUB_TERM_MARGIN, GRUB_TERM_TOP_BORDER_Y);
- grub_putcode (GRUB_TERM_DISP_UL);
- for (i = 0; i < (unsigned) GRUB_TERM_BORDER_WIDTH - 2; i++)
- grub_putcode (GRUB_TERM_DISP_HLINE);
- grub_putcode (GRUB_TERM_DISP_UR);
-
- for (i = 0; i < (unsigned) GRUB_TERM_NUM_ENTRIES; i++)
- {
- grub_gotoxy (GRUB_TERM_MARGIN, GRUB_TERM_TOP_BORDER_Y + i + 1);
- grub_putcode (GRUB_TERM_DISP_VLINE);
- grub_gotoxy (GRUB_TERM_MARGIN + GRUB_TERM_BORDER_WIDTH - 1,
- GRUB_TERM_TOP_BORDER_Y + i + 1);
- grub_putcode (GRUB_TERM_DISP_VLINE);
- }
-
- grub_gotoxy (GRUB_TERM_MARGIN,
- GRUB_TERM_TOP_BORDER_Y + GRUB_TERM_NUM_ENTRIES + 1);
- grub_putcode (GRUB_TERM_DISP_LL);
- for (i = 0; i < (unsigned) GRUB_TERM_BORDER_WIDTH - 2; i++)
- grub_putcode (GRUB_TERM_DISP_HLINE);
- grub_putcode (GRUB_TERM_DISP_LR);
-
- grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
-
- grub_gotoxy (GRUB_TERM_MARGIN,
- (GRUB_TERM_TOP_BORDER_Y + GRUB_TERM_NUM_ENTRIES
- + GRUB_TERM_MARGIN + 1));
-}
-
-static void
-print_message (int nested, int edit)
-{
- grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
-
- if (edit)
- {
- grub_printf ("\n\
- Minimum Emacs-like screen editing is supported. TAB lists\n\
- completions. Press Ctrl-x to boot, Ctrl-c for a command-line\n\
- or ESC to return menu.");
- }
- else
- {
- grub_printf ("\n\
- Use the %C and %C keys to select which entry is highlighted.\n",
- (grub_uint32_t) GRUB_TERM_DISP_UP, (grub_uint32_t)
GRUB_TERM_DISP_DOWN);
- grub_printf ("\
- Press enter to boot the selected OS, \'e\' to edit the\n\
- commands before booting or \'c\' for a command-line.");
- if (nested)
- grub_printf ("\n\
- ESC to return previous menu.");
- }
-
-}
-
-static grub_menu_entry_t
-get_entry (grub_menu_t menu, int no)
-{
grub_menu_entry_t e;
for (e = menu->entry_list; e && no > 0; e = e->next, no--)
@@ -112,140 +38,10 @@
return e;
}
-static void
-print_entry (int y, int highlight, grub_menu_entry_t entry)
-{
- int x;
- const char *title;
- grub_size_t title_len;
- grub_ssize_t len;
- grub_uint32_t *unicode_title;
- grub_ssize_t i;
- grub_uint8_t old_color_normal, old_color_highlight;
-
- title = entry ? entry->title : "";
- title_len = grub_strlen (title);
- unicode_title = grub_malloc (title_len * sizeof (*unicode_title));
- if (! unicode_title)
- /* XXX How to show this error? */
- return;
-
- len = grub_utf8_to_ucs4 (unicode_title, title_len,
- (grub_uint8_t *) title, -1, 0);
- if (len < 0)
- {
- /* It is an invalid sequence. */
- grub_free (unicode_title);
- return;
- }
-
- grub_getcolor (&old_color_normal, &old_color_highlight);
- grub_setcolor (grub_color_menu_normal, grub_color_menu_highlight);
- grub_setcolorstate (highlight
- ? GRUB_TERM_COLOR_HIGHLIGHT
- : GRUB_TERM_COLOR_NORMAL);
-
- grub_gotoxy (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_MARGIN, y);
-
- for (x = GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_MARGIN + 1, i = 0;
- x < GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_BORDER_WIDTH - GRUB_TERM_MARGIN;
- i++)
- {
- if (i < len
- && x <= (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_BORDER_WIDTH
- - GRUB_TERM_MARGIN - 1))
- {
- grub_ssize_t width;
-
- width = grub_getcharwidth (unicode_title[i]);
-
- if (x + width > (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_BORDER_WIDTH
- - GRUB_TERM_MARGIN - 1))
- grub_putcode (GRUB_TERM_DISP_RIGHT);
- else
- grub_putcode (unicode_title[i]);
-
- x += width;
- }
- else
- {
- grub_putchar (' ');
- x++;
- }
- }
- grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
- grub_putchar (' ');
-
- grub_gotoxy (GRUB_TERM_CURSOR_X, y);
-
- grub_setcolor (old_color_normal, old_color_highlight);
- grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
- grub_free (unicode_title);
-}
-
-static void
-print_entries (grub_menu_t menu, int first, int offset)
-{
- grub_menu_entry_t e;
- int i;
-
- grub_gotoxy (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_BORDER_WIDTH,
- GRUB_TERM_FIRST_ENTRY_Y);
-
- if (first)
- grub_putcode (GRUB_TERM_DISP_UP);
- else
- grub_putchar (' ');
-
- e = get_entry (menu, first);
-
- for (i = 0; i < GRUB_TERM_NUM_ENTRIES; i++)
- {
- print_entry (GRUB_TERM_FIRST_ENTRY_Y + i, offset == i, e);
- if (e)
- e = e->next;
- }
-
- grub_gotoxy (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_BORDER_WIDTH,
- GRUB_TERM_TOP_BORDER_Y + GRUB_TERM_NUM_ENTRIES);
-
- if (e)
- grub_putcode (GRUB_TERM_DISP_DOWN);
- else
- grub_putchar (' ');
-
- grub_gotoxy (GRUB_TERM_CURSOR_X, GRUB_TERM_FIRST_ENTRY_Y + offset);
-}
-
-/* Initialize the screen. If NESTED is non-zero, assume that this menu
- is run from another menu or a command-line. If EDIT is non-zero, show
- a message for the menu entry editor. */
-void
-grub_menu_init_page (int nested, int edit)
-{
- grub_uint8_t old_color_normal, old_color_highlight;
-
- grub_getcolor (&old_color_normal, &old_color_highlight);
-
- /* By default, use the same colors for the menu. */
- grub_color_menu_normal = old_color_normal;
- grub_color_menu_highlight = old_color_highlight;
-
- /* Then give user a chance to replace them. */
- grub_parse_color_name_pair (&grub_color_menu_normal, grub_env_get
("menu_color_normal"));
- grub_parse_color_name_pair (&grub_color_menu_highlight, grub_env_get
("menu_color_highlight"));
-
- grub_normal_init_page ();
- grub_setcolor (grub_color_menu_normal, grub_color_menu_highlight);
- draw_border ();
- grub_setcolor (old_color_normal, old_color_highlight);
- print_message (nested, edit);
-}
-
/* Return the current timeout. If the variable "timeout" is not set or
invalid, return -1. */
-static int
-get_timeout (void)
+int
+grub_menu_get_timeout (void)
{
char *val;
int timeout;
@@ -272,8 +68,8 @@
}
/* Set current timeout in the variable "timeout". */
-static void
-set_timeout (int timeout)
+void
+grub_menu_set_timeout (int timeout)
{
/* Ignore TIMEOUT if it is zero, because it will be unset really soon. */
if (timeout > 0)
@@ -285,11 +81,15 @@
}
}
-/* Get the entry number from the variable NAME. */
+/* Get the first entry number from the value of the environment variable NAME,
+ which is a space-separated list of nonnegative integers. The entry number
+ which is returned is stripped from the value of NAME. If no entry number
+ can be found, -1 is returned. */
static int
-get_entry_number (const char *name)
+get_and_remove_first_entry_number (const char *name)
{
char *val;
+ char *tail;
int entry;
val = grub_env_get (name);
@@ -298,10 +98,18 @@
grub_error_push ();
- entry = (int) grub_strtoul (val, 0, 0);
+ entry = (int) grub_strtoul (val, &tail, 0);
- if (grub_errno != GRUB_ERR_NONE)
+ if (grub_errno == GRUB_ERR_NONE)
{
+ /* Skip whitespace to find the next digit. */
+ while (*tail && grub_isspace (*tail))
+ tail++;
+ grub_env_set (name, tail);
+ }
+ else
+ {
+ grub_env_unset (name);
grub_errno = GRUB_ERR_NONE;
entry = -1;
}
@@ -311,245 +119,6 @@
return entry;
}
-static void
-print_timeout (int timeout, int offset, int second_stage)
-{
- /* NOTE: Do not remove the trailing space characters.
- They are required to clear the line. */
- char *msg = " The highlighted entry will be booted automatically in %ds.
";
- char *msg_end = grub_strchr (msg, '%');
-
- grub_gotoxy (second_stage ? (msg_end - msg) : 0, GRUB_TERM_HEIGHT - 3);
- grub_printf (second_stage ? msg_end : msg, timeout);
- grub_gotoxy (GRUB_TERM_CURSOR_X, GRUB_TERM_FIRST_ENTRY_Y + offset);
- grub_refresh ();
-};
-
-static int
-run_menu (grub_menu_t menu, int nested)
-{
- int first, offset;
- grub_uint64_t saved_time;
- int default_entry;
- int timeout;
-
- first = 0;
-
- default_entry = get_entry_number ("default");
-
- /* If DEFAULT_ENTRY is not within the menu entries, fall back to
- the first entry. */
- if (default_entry < 0 || default_entry >= menu->size)
- default_entry = 0;
-
- /* If timeout is 0, drawing is pointless (and ugly). */
- if (get_timeout () == 0)
- return default_entry;
-
- offset = default_entry;
- if (offset > GRUB_TERM_NUM_ENTRIES - 1)
- {
- first = offset - (GRUB_TERM_NUM_ENTRIES - 1);
- offset = GRUB_TERM_NUM_ENTRIES - 1;
- }
-
- /* Initialize the time. */
- saved_time = grub_get_time_ms ();
-
- refresh:
- grub_setcursor (0);
- grub_menu_init_page (nested, 0);
- print_entries (menu, first, offset);
- grub_refresh ();
-
- timeout = get_timeout ();
-
- if (timeout > 0)
- print_timeout (timeout, offset, 0);
-
- while (1)
- {
- int c;
- timeout = get_timeout ();
-
- if (timeout > 0)
- {
- grub_uint64_t current_time;
-
- current_time = grub_get_time_ms ();
- if (current_time - saved_time >= 1000)
- {
- timeout--;
- set_timeout (timeout);
- saved_time = current_time;
- print_timeout (timeout, offset, 1);
- }
- }
-
- if (timeout == 0)
- {
- grub_env_unset ("timeout");
- return default_entry;
- }
-
- if (grub_checkkey () >= 0 || timeout < 0)
- {
- c = GRUB_TERM_ASCII_CHAR (grub_getkey ());
-
- if (timeout >= 0)
- {
- grub_gotoxy (0, GRUB_TERM_HEIGHT - 3);
- grub_printf ("\
- ");
- grub_env_unset ("timeout");
- grub_env_unset ("fallback");
- grub_gotoxy (GRUB_TERM_CURSOR_X, GRUB_TERM_FIRST_ENTRY_Y +
offset);
- }
-
- switch (c)
- {
- case GRUB_TERM_HOME:
- first = 0;
- offset = 0;
- print_entries (menu, first, offset);
- break;
-
- case GRUB_TERM_END:
- offset = menu->size - 1;
- if (offset > GRUB_TERM_NUM_ENTRIES - 1)
- {
- first = offset - (GRUB_TERM_NUM_ENTRIES - 1);
- offset = GRUB_TERM_NUM_ENTRIES - 1;
- }
- print_entries (menu, first, offset);
- break;
-
- case GRUB_TERM_UP:
- case '^':
- if (offset > 0)
- {
- print_entry (GRUB_TERM_FIRST_ENTRY_Y + offset, 0,
- get_entry (menu, first + offset));
- offset--;
- print_entry (GRUB_TERM_FIRST_ENTRY_Y + offset, 1,
- get_entry (menu, first + offset));
- }
- else if (first > 0)
- {
- first--;
- print_entries (menu, first, offset);
- }
- break;
-
- case GRUB_TERM_DOWN:
- case 'v':
- if (menu->size > first + offset + 1)
- {
- if (offset < GRUB_TERM_NUM_ENTRIES - 1)
- {
- print_entry (GRUB_TERM_FIRST_ENTRY_Y + offset, 0,
- get_entry (menu, first + offset));
- offset++;
- print_entry (GRUB_TERM_FIRST_ENTRY_Y + offset, 1,
- get_entry (menu, first + offset));
- }
- else
- {
- first++;
- print_entries (menu, first, offset);
- }
- }
- break;
-
- case GRUB_TERM_PPAGE:
- if (first == 0)
- {
- offset = 0;
- }
- else
- {
- first -= GRUB_TERM_NUM_ENTRIES;
-
- if (first < 0)
- {
- offset += first;
- first = 0;
- }
- }
- print_entries (menu, first, offset);
- break;
-
- case GRUB_TERM_NPAGE:
- if (offset == 0)
- {
- offset += GRUB_TERM_NUM_ENTRIES - 1;
- if (first + offset >= menu->size)
- {
- offset = menu->size - first - 1;
- }
- }
- else
- {
- first += GRUB_TERM_NUM_ENTRIES;
-
- if (first + offset >= menu->size)
- {
- first -= GRUB_TERM_NUM_ENTRIES;
- offset += GRUB_TERM_NUM_ENTRIES;
-
- if (offset > menu->size - 1 ||
- offset > GRUB_TERM_NUM_ENTRIES - 1)
- {
- offset = menu->size - first - 1;
- }
- if (offset > GRUB_TERM_NUM_ENTRIES)
- {
- first += offset - GRUB_TERM_NUM_ENTRIES + 1;
- offset = GRUB_TERM_NUM_ENTRIES - 1;
- }
- }
- }
- print_entries (menu, first, offset);
- break;
-
- case '\n':
- case '\r':
- case 6:
- grub_setcursor (1);
- return first + offset;
-
- case '\e':
- if (nested)
- {
- grub_setcursor (1);
- return -1;
- }
- break;
-
- case 'c':
- grub_cmdline_run (1);
- goto refresh;
-
- case 'e':
- {
- grub_menu_entry_t e = get_entry (menu, first + offset);
- if (e)
- grub_menu_entry_run (e);
- }
- goto refresh;
-
- default:
- break;
- }
-
- grub_refresh ();
- }
- }
-
- /* Never reach here. */
- return -1;
-}
-
/* Run a menu entry. */
void
grub_menu_execute_entry(grub_menu_entry_t entry)
@@ -561,58 +130,37 @@
grub_command_execute ("boot", 0);
}
-static grub_err_t
-show_text_menu (grub_menu_t menu, int nested)
+/* Execute ENTRY from the menu MENU, falling back to entries specified
+ in the environment variable "fallback" if it fails. CALLBACK is a
+ pointer to a struct of function pointers which are used to allow the
+ caller provide feedback to the user. */
+void
+grub_menu_execute_with_fallback (grub_menu_t menu,
+ grub_menu_entry_t entry,
+ grub_menu_execute_callback_t callback,
+ void *callback_data)
{
- while (1)
- {
- int boot_entry;
- grub_menu_entry_t e;
- int fallback_entry;
+ int fallback_entry;
- boot_entry = run_menu (menu, nested);
- if (boot_entry < 0)
- break;
+ callback->notify_booting (entry, callback_data);
- e = get_entry (menu, boot_entry);
- if (! e)
- continue; /* Menu is empty. */
+ grub_menu_execute_entry (entry);
- grub_cls ();
- grub_setcursor (1);
+ /* Deal with fallback entries. */
+ while ((fallback_entry = get_and_remove_first_entry_number ("fallback"))
+ >= 0)
+ {
+ grub_print_error ();
+ grub_errno = GRUB_ERR_NONE;
- grub_printf (" Booting \'%s\'\n\n", e->title);
-
- grub_menu_execute_entry (e);
-
- /* Deal with a fallback entry. */
- /* FIXME: Multiple fallback entries like GRUB Legacy. */
- fallback_entry = get_entry_number ("fallback");
- if (fallback_entry >= 0)
- {
- grub_print_error ();
- grub_errno = GRUB_ERR_NONE;
-
- e = get_entry (menu, fallback_entry);
- grub_env_unset ("fallback");
- grub_printf ("\n Falling back to \'%s\'\n\n", e->title);
- grub_menu_execute_entry (e);
- }
-
- if (grub_errno != GRUB_ERR_NONE)
- {
@@ Diff output truncated at 153600 characters. @@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [1990] 2009-02-13 Colin D Bennett <address@hidden>,
Colin Bennett <=