2009-11-23 Robert Millan <rmh.grub@aybabtu.com>

        * script/sh/execute.c: Move from here ...
        * script/execute.c: ... to here.  Update all users.
        * script/sh/function.c: Move from here ...
        * script/function.c: ... to here.  Update all users.
        * script/sh/lexer.c: Move from here ...
        * script/lexer.c: ... to here.  Update all users.
        * script/sh/main.c: Move from here ...
        * script/main.c: ... to here.  Update all users.
        * script/sh/parser.y: Move from here ...
        * script/parser.y: ... to here.  Update all users.
        * script/sh/script.c: Move from here ...
        * script/script.c: ... to here.  Update all users.

diff --git a/ChangeLog b/ChangeLog
index 555a702b01a094eb71832b68c4d265cd8d01d3a6..ceeb1081b70eda76751878ff86d8fefc59ef7e09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-23  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * script/sh/execute.c: Move from here ...
+       * script/execute.c: ... to here.  Update all users.
+       * script/sh/function.c: Move from here ...
+       * script/function.c: ... to here.  Update all users.
+       * script/sh/lexer.c: Move from here ...
+       * script/lexer.c: ... to here.  Update all users.
+       * script/sh/main.c: Move from here ...
+       * script/main.c: ... to here.  Update all users.
+       * script/sh/parser.y: Move from here ...
+       * script/parser.y: ... to here.  Update all users.
+       * script/sh/script.c: Move from here ...
+       * script/script.c: ... to here.  Update all users.
+
 2009-11-23  Robert Millan  <rmh.grub@aybabtu.com>
 
        * configure.ac: Detect all `emu' platforms.  Define

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index e8172b00dadc4f8e9ac6773a3e6ecbd8dfd04a74..268d9743eb39f0df128c055a9f978ebab38f4a69 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 sbin_UTILITIES += grub-emu
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
@@ -28,8 +28,8 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.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                                              \
-       script/sh/main.c script/sh/execute.c script/sh/function.c       \
-       script/sh/lexer.c script/sh/script.c grub_script.tab.c          \
+       script/main.c script/execute.c script/function.c        \
+       script/lexer.c script/script.c grub_script.tab.c                \
        partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c   \
        partmap/acorn.c partmap/gpt.c                                   \
        \
@@ -84,6 +84,6 @@ grub_mkfont_CFLAGS = $(freetype_cflags)
 grub_mkfont_LDFLAGS = $(freetype_libs)
 endif
 
-grub_script.tab.c grub_script.tab.h: script/sh/parser.y
-       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/sh/parser.y
+grub_script.tab.c grub_script.tab.h: script/parser.y
+       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h

diff --git a/conf/common.rmk b/conf/common.rmk
index dc6d44d65379e1bb38ac6955f4291022984d7d14..00d57960033146bb9f55e534cbf68b76ad504a11 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -72,8 +72,8 @@ grub_mkfont_LDFLAGS = $(freetype_libs)
 endif
 
 # For the parser.
-grub_script.tab.c grub_script.tab.h: script/sh/parser.y
-       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/sh/parser.y
+grub_script.tab.c grub_script.tab.h: script/parser.y
+       $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
 
 # For grub-probe.
@@ -525,8 +525,8 @@ normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For sh.mod.
-sh_mod_SOURCES = script/sh/main.c script/sh/script.c script/sh/execute.c \
-       script/sh/function.c script/sh/lexer.c grub_script.tab.c
+sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
+       script/function.c script/lexer.c grub_script.tab.c
 sh_mod_CFLAGS = $(COMMON_CFLAGS)
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 74a7cc9c868a1d40e8be035a97b4a91e50b3f924..5ab392a4d7f0498373dee7ca830fe5d144fa363e 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 13c3a5731dde83ff063eeaf491017eb06560bd14..ac88ebd42dcc628fdd8e3d5367cee7ac872b0641 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS = -fno-builtin -m32
 COMMON_LDFLAGS = -melf_i386 -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Utilities.
 bin_UTILITIES = grub-mkimage

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 2d9532380233def514ca5282cc0e50fe0ee1b980..2df3421f79f40896eabf17895fb29e9840a12f12 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS   = -ffreestanding -mrtd -mregparm=3
 COMMON_LDFLAGS = -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 pkglib_PROGRAMS = kernel.img

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index d4118526bed34677d8a63442a8a638726b679096..b100d94e2f8335bd338b6ea57e5ae82dcb9bfe32 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -7,7 +7,7 @@ COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index b8c62711b7e417458b024912c04b0b18cb005bc1..0a87a6a5df3419a680b4c557b797d893047568cf 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -6,7 +6,7 @@ COMMON_CFLAGS = -ffreestanding
 COMMON_LDFLAGS += -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 945a33d3f5e32746a8fad6a7c8520c7b40e9cee3..3abddf511134c670ab89257df9918bbba7068fcc 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -6,7 +6,7 @@ COMMON_CFLAGS = -ffreestanding -m64 -mno-app-regs
 COMMON_LDFLAGS = -melf64_sparc -nostdlib -mno-relax
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 pkglib_IMAGES = boot.img diskboot.img kernel.img

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index df32b0a5fcc813709bc1be817d0256af1b67da63..3d519e955a9e273c5da96f4202ff49c9ed56fb0e 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS = -fno-builtin -m64
 COMMON_LDFLAGS = -melf_x86_64 -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Utilities.
 bin_UTILITIES = grub-mkimage

diff --git a/script/sh/execute.c b/script/execute.c
similarity index 100%
rename from script/sh/execute.c
rename to script/execute.c

diff --git a/script/sh/function.c b/script/function.c
similarity index 100%
rename from script/sh/function.c
rename to script/function.c

diff --git a/script/sh/lexer.c b/script/lexer.c
similarity index 100%
rename from script/sh/lexer.c
rename to script/lexer.c

diff --git a/script/sh/main.c b/script/main.c
similarity index 100%
rename from script/sh/main.c
rename to script/main.c

diff --git a/script/sh/parser.y b/script/parser.y
similarity index 100%
rename from script/sh/parser.y
rename to script/parser.y

diff --git a/script/sh/script.c b/script/script.c
similarity index 100%
rename from script/sh/script.c
rename to script/script.c