rename grub-mkrawimage to grub-mkimage

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index f2490ba979f6e397886cf365e1fb3a728ca857b6..2dd874e1389e93013f88272651d94f32bf1977cd 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -65,10 +65,10 @@ bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
        util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
+util/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h

diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 9232317911d1db1d5369417104470649af1f5a7f..003f86c33819043730897869c314e1f80e1c9f3a 100644 (file)
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -14,10 +14,10 @@ boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LI
 boot_img_FORMAT = binary
 
 bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkimage.c util/misc.c \
        util/resolve.c gnulib/progname.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
+util/grub-mkimage.c_DEPENDENCIES = Makefile
 
 pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/qemu/startup.S \

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 4603c219e0a80c5d65c32d6e4fc72d0215292dfd..c748d394528a919092ff75017b52b13607a81656 100644 (file)
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -12,10 +12,10 @@ bin_SCRIPTS =
 
 # For grub-mkimage.
 bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
        util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
+util/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For serial.mod.
 pkglib_MODULES += serial.mod

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 8e96599aa5db603aa0b1f8b071824627bdd6ba26..dd1524df1e6b9c3ba3be8c01ae9560772d73ad98 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -45,7 +45,7 @@ bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup grub-ofpathname
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkimage.c util/misc.c \
         util/resolve.c gnulib/progname.c
 
 # For grub-setup.

diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index bab561cc4075fff85d5fe7245ed2d97692f9cf10..8bf0a08d9da8085a690bfe2591d943d092dbf529 100644 (file)
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -4,7 +4,7 @@
 bin_UTILITIES = grub-mkimage
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c \
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c \
        util/misc.c util/resolve.c
 util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 

diff --git a/util/grub-mkrawimage.c b/util/grub-mkimage.c
similarity index 100%
rename from util/grub-mkrawimage.c
rename to util/grub-mkimage.c