2008-06-19 Pavel Roskin <proski@gnu.org>

	* conf/i386-efi.rmk: Recompile grub-mkimage.c if Makefile has
	changed.  This is needed in case GRUB_LIBDIR changes.
	* conf/i386-ieee1275.rmk: Likewise.
	* conf/i386-linuxbios.rmk: Likewise.
	* conf/i386-pc.rmk: Likewise.
	* conf/powerpc-ieee1275.rmk: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6b75fe01ab16e351063f08377b55d8c779cc65d4..2e1bf307e012ff6e59465ea95a8fa9397a011e79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-19  Pavel Roskin  <proski@gnu.org>
+
+       * conf/i386-efi.rmk: Recompile grub-mkimage.c if Makefile has
+       changed.  This is needed in case GRUB_LIBDIR changes.
+       * conf/i386-ieee1275.rmk: Likewise.
+       * conf/i386-linuxbios.rmk: Likewise.
+       * conf/i386-pc.rmk: Likewise.
+       * conf/powerpc-ieee1275.rmk: Likewise.
+
 2008-06-18  Pavel Roskin  <proski@gnu.org>
 
        * conf/powerpc-ieee1275.rmk (kernel_elf_SOURCES): Rename

diff --git a/conf/i386-efi.mk b/conf/i386-efi.mk
index b6a9d26f1087445452b3e6cc2e83216a2b91a560..4d280451e32a0d5b83aa3595e2cf1386b29265c9 100644 (file)
--- a/conf/i386-efi.mk
+++ b/conf/i386-efi.mk
@@ -35,6 +35,7 @@ grub_mkimage-util_resolve.o: util/resolve.c $(util/resolve.c_DEPENDENCIES)
        $(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_mkimage_CFLAGS) -MD -c -o $@ $<
 -include grub_mkimage-util_resolve.d
 
+util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 #grub_setup_SOURCES = util/i386/pc/grub-setup.c util/biosdisk.c        \

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 87626c25e129d4671b01c42af37be6c8d536fd4d..311b6ab7d7cec4851829d278a3e50f74d5e5b8a1 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -17,6 +17,7 @@ sbin_UTILITIES = grub-mkdevicemap
 # For grub-mkimage.
 grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \
        util/resolve.c
+util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 #grub_setup_SOURCES = util/i386/pc/grub-setup.c util/biosdisk.c        \

diff --git a/conf/i386-ieee1275.mk b/conf/i386-ieee1275.mk
index 667422a868268bd9376965abd36f571dba3f5ea6..a51fe14bbfff6f0df1d3f1c7f8e07667cfb7232f 100644 (file)
--- a/conf/i386-ieee1275.mk
+++ b/conf/i386-ieee1275.mk
@@ -178,6 +178,7 @@ grub_mkimage-util_resolve.o: util/resolve.c $(util/resolve.c_DEPENDENCIES)
 -include grub_mkimage-util_resolve.d
 
 grub_mkimage_LDFLAGS = $(LIBLZO)
+util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-mkdevicemap.
 grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index ac2f45df424ccb2bc6f22924c6fd100b6f79118e..e4f2a66377a8114633e07de606f5da5e0925f489 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -50,6 +50,7 @@ endif
 grub_mkimage_SOURCES = util/elf/grub-mkimage.c util/misc.c \
        util/resolve.c
 grub_mkimage_LDFLAGS = $(LIBLZO)
+util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-mkdevicemap.
 grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \

diff --git a/conf/i386-linuxbios.mk b/conf/i386-linuxbios.mk
index 467cc3863714d024f06dc27583838506996d48ca..19e5eb671dd52ed88d63d4a446823f943581fcf9 100644 (file)
--- a/conf/i386-linuxbios.mk
+++ b/conf/i386-linuxbios.mk
@@ -165,6 +165,7 @@ grub_mkimage-util_resolve.o: util/resolve.c $(util/resolve.c_DEPENDENCIES)
 -include grub_mkimage-util_resolve.d
 
 grub_mkimage_LDFLAGS = $(LIBLZO)
+util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-mkdevicemap.
 grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \

diff --git a/conf/i386-linuxbios.rmk b/conf/i386-linuxbios.rmk
index 31f03a9e54c3b392aa5e8b0e3fcef76a01d73e7f..d2546beebd12d780d409a34e309b61beaee8d981 100644 (file)
--- a/conf/i386-linuxbios.rmk
+++ b/conf/i386-linuxbios.rmk
@@ -49,6 +49,7 @@ endif
 grub_mkimage_SOURCES = util/elf/grub-mkimage.c util/misc.c \
        util/resolve.c
 grub_mkimage_LDFLAGS = $(LIBLZO)
+util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-mkdevicemap.
 grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \

diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk
index 6c0c12f73969d89f49b2a67fe188182bc16d5bc2..37e08bcb6a87821ba2ec67ad0861b0948812cfd7 100644 (file)
--- a/conf/i386-pc.mk
+++ b/conf/i386-pc.mk
@@ -248,6 +248,7 @@ grub_mkimage-util_resolve.o: util/resolve.c $(util/resolve.c_DEPENDENCIES)
 
 grub_mkimage_CFLAGS = -DGRUB_MEMORY_MACHINE_LINK_ADDR=$(GRUB_MEMORY_MACHINE_LINK_ADDR)
 grub_mkimage_LDFLAGS = $(LIBLZO)
+util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index a3f8467e9aa81f122928895fb5cc4bab702c92d1..7b7924fe2e295ad8f01c3fdaf245365f145ab3c5 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -76,6 +76,7 @@ grub_mkimage_SOURCES = util/i386/pc/grub-mkimage.c util/misc.c \
        util/resolve.c
 grub_mkimage_CFLAGS = -DGRUB_MEMORY_MACHINE_LINK_ADDR=$(GRUB_MEMORY_MACHINE_LINK_ADDR)
 grub_mkimage_LDFLAGS = $(LIBLZO)
+util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index e1d41df898c65bf48de0a3e6e80c9e7bfb1d68b5..748d8fd40078c338af6469207766e21b1e4670ae 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -55,6 +55,7 @@ grub_mkimage-util_resolve.o: util/resolve.c $(util/resolve.c_DEPENDENCIES)
        $(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(grub_mkimage_CFLAGS) -MD -c -o $@ $<
 -include grub_mkimage-util_resolve.d
 
+util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-mkdevicemap.
 grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 935b505fc0d528ae680bc916e37d7d2259c16a25..bb044908e67d412e711943019b5eeb19b364cc10 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -37,6 +37,7 @@ endif
 # For grub-mkimage.
 grub_mkimage_SOURCES = util/elf/grub-mkimage.c util/misc.c \
         util/resolve.c 
+util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-mkdevicemap.
 grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \