2009-05-04 Felix Zielcke <fzielcke@z-51.de>

	* conf/i386-efi.rmk (grub_emu_SOURCES): Remove `normal/execute.c',
	`normal/lexer.c', `kern/rescue.c', `normal/function.c', `normal/misc.c'
	and `normal/script.c'.  Add `kern/rescue_reader.c',
	`kern/rescue_parser.c', `script/sh/main.c', `script/sh/execute.c',
	`script/sh/function.c', `script/sh/lexer.c', `script/sh/script.c' and
	`grub_script.tab.c'.

	* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
	* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): Likewise.
	* conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 4d9396e130842c012db7967244acfa3ec5908ee1..d4eebfe58abfe20ca628549416f6e8695ec00c56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-05-04  Felix Zielcke  <fzielcke@z-51.de>
+
+       * conf/i386-efi.rmk (grub_emu_SOURCES): Remove `normal/execute.c',
+       `normal/lexer.c', `kern/rescue.c', `normal/function.c', `normal/misc.c'
+       and `normal/script.c'.  Add `kern/rescue_reader.c',
+       `kern/rescue_parser.c', `script/sh/main.c', `script/sh/execute.c', 
+       `script/sh/function.c', `script/sh/lexer.c', `script/sh/script.c' and
+       `grub_script.tab.c'.
+
+       * conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+       * conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
+       * conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+       * conf/i386-coreboot.rmk (grub_emu_SOURCES): Likewise.
+       * conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+
 2009-05-04  Robert Millan  <rmh.grub@aybabtu.com>
 
        * util/misc.c (grub_util_warn): New function.  Emmits a warning

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index f000328ab92e98d1a64fe6dfdfd9d92c06e280d9..1f212346b8c7c27d6690fd2eb7c6be5b688302ee 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -73,17 +73,18 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
        io/gzio.c                                                       \
        kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c       \
        kern/err.c kern/list.c kern/handler.c                           \
-       kern/command.c kern/corecmd.c commands/extcmd.c                 \
-       normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
-       commands/boot.c kern/main.c kern/misc.c kern/parser.c           \
-       grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/function.c\
-       normal/handler.c        \
+       kern/command.c kern/corecmd.c commands/extcmd.c kern/file.c     \
+       kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c \
+       kern/partition.c kern/reader.c kern/term.c                      \
+       kern/rescue_reader.c kern/rescue_parser.c                       \
+       lib/arg.c normal/cmdline.c normal/misc.c                        \
+       normal/handler.c normal/autofs.c                                \
        normal/completion.c normal/datetime.c normal/main.c             \
-       normal/menu_text.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                                                  \
+       script/sh/main.c script/sh/execute.c script/sh/function.c       \
+       script/sh/lexer.c script/sh/script.c grub_script.tab.c          \
        partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c      \
        partmap/acorn.c partmap/gpt.c                                   \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index c698d3ef5f1e70518f81f9664626c3a5390d2be8..16ccea679b5867a277c35f740c33ae1ac6c5e5f0 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -49,17 +49,18 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c         \
        io/gzio.c                                                       \
        kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c       \
        kern/err.c kern/list.c kern/handler.c                           \
-       kern/command.c kern/corecmd.c commands/extcmd.c                 \
-       normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
-       commands/boot.c kern/main.c kern/misc.c kern/parser.c           \
-       grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
+       kern/command.c kern/corecmd.c commands/extcmd.c kern/file.c     \
+       kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c \
+       kern/partition.c kern/reader.c kern/term.c                      \
+       kern/rescue_reader.c kern/rescue_parser.c                       \
        lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
-       normal/function.c       \
+       normal/autofs.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                                                  \
+       script/sh/main.c script/sh/execute.c script/sh/function.c       \
+       script/sh/lexer.c script/sh/script.c grub_script.tab.c          \
        partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c      \
        partmap/acorn.c partmap/gpt.c                                   \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 804676b1227d0d5dd4b6446077ffdb50f8d4a52c..b195f16d6b6aefe65df6bac7821c9567e79190f4 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -73,16 +73,17 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
        io/gzio.c                                                       \
        kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c       \
        kern/err.c kern/list.c kern/handler.c                           \
-       kern/command.c kern/corecmd.c commands/extcmd.c                 \
-       normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
-       commands/boot.c kern/main.c kern/misc.c kern/parser.c           \
-       grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
-       normal/function.c normal/handler.c \
+       kern/command.c kern/corecmd.c commands/extcmd.c kern/file.c     \
+       kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c \
+       kern/partition.c kern/reader.c kern/term.c                      \
+       kern/rescue_reader.c kern/rescue_parser.c                       \
+       lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c      \
+       normal/handler.c normal/autofs.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                                                  \
+       script/sh/main.c script/sh/execute.c script/sh/function.c       \
+       script/sh/lexer.c script/sh/script.c grub_script.tab.c          \
        partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c      \
        partmap/acorn.c partmap/gpt.c                                   \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 911adc6fbd29759b9957cd8f139d81675e9a458e..53bffa6de6cd55f83b1c1713cbee783183d6b48b 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -55,17 +55,18 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c         \
        io/gzio.c                                                       \
        kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c       \
        kern/err.c kern/file.c kern/fs.c commands/boot.c kern/main.c    \
-       kern/misc.c kern/parser.c kern/partition.c kern/rescue.c        \
+       kern/misc.c kern/parser.c kern/partition.c kern/reader.c        \
        kern/term.c kern/list.c kern/handler.c fs/fshelp.c              \
        kern/command.c kern/corecmd.c commands/extcmd.c                 \
-       lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c   \
-       normal/completion.c normal/execute.c                            \
-       normal/function.c normal/handler.c normal/lexer.c normal/main.c \
-       normal/menu.c   \
+       lib/arg.c normal/cmdline.c normal/datetime.c                    \
+       normal/completion.c normal/misc.c                               \
+       normal/handler.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/menu_entry.c normal/menu_viewer.c                        \
        normal/color.c                                                  \
+       script/sh/main.c script/sh/execute.c script/sh/function.c       \
+       script/sh/lexer.c script/sh/script.c                            \
        partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c      \
        partmap/acorn.c                                                 \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index c11442abc834e79ae9d3b619c4ee9d19b78e76d8..158b9e67337e7ded6b8982d7301ee261e7ae1fa5 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -112,16 +112,18 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c  \
        io/gzio.c                                                       \
        kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c       \
        kern/err.c kern/file.c kern/fs.c kern/loader.c kern/main.c      \
-       kern/misc.c kern/parser.c kern/partition.c kern/rescue.c        \
+       kern/misc.c kern/parser.c kern/partition.c kern/reader.c        \
+       kern/rescue_reader.c kern/rescue_parser.c
        kern/term.c fs/fshelp.c                                         \
        kern/list.c kern/handler.c                                      \
-       lib/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    \
+       lib/arg.c normal/cmdline.c                                      \
+       normal/completion.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                                                  \
+       script/sh/main.c script/sh/execute.c script/sh/function.c       \
+       script/sh/lexer.c script/sh/script.c                            \
        partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c      \
        partmap/acorn.c                                                 \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 8cdfa8a7bc372cdf0ba331d542df4a9236f59cb2..92ad9f7d43389428ee47397f282b52fa51049b35 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -47,17 +47,17 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c         \
        io/gzio.c                                                       \
        kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c       \
        kern/err.c kern/list.c kern/handler.c                           \
-       kern/command.c kern/corecmd.c commands/extcmd.c                 \
-       normal/execute.c kern/file.c kern/fs.c normal/lexer.c           \
-       commands/boot.c kern/main.c kern/misc.c kern/parser.c           \
-       grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c    \
-       lib/arg.c normal/cmdline.c normal/command.c normal/function.c\
+       kern/command.c kern/corecmd.c commands/extcmd.c kern/file.c     \
+       kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c \
+       kern/partition.c kern/readerescue.c kern/term.c                 \
+       lib/arg.c normal/cmdline.c normal/misc.c normal/autofs.c        \
        normal/completion.c normal/datetime.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                                                  \
+       script/sh/main.c script/sh/execute.c script/sh/function.c       \
+       script/sh/lexer.c script/sh/script.c grub_script.tab.c          \
        partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c      \
        partmap/acorn.c partmap/gpt.c                                   \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \