Re: [PATCH] fbdev: move logo externs to header file

[Sam Ravnborg <sam@ravnborg.org>]

On Fri, Apr 03, 2009 at 01:45:40PM +0200, Geert Uytterhoeven wrote:
> Now we have __initconst, we can finally move the external declarations for the
> various Linux logo structures to <linux/linux_logo.h>.
> 
> Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
> Acked-By: James Simmons <jsimmons@infradead.org>
> ---
> James' ack dates back to the previous submission (way to long ago), when the
> logos were still __initdata, which caused failures on some platforms with some
> toolchain versions.
> 
> Note: you have to remove the generated logos, as they're not automatically
> regenerated if scripts/pnmtologo.c changes.

Something like this to fix that bug?
Untested as I'm busy atm.

	Sam

diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index b91251d..6a26982 100644
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -37,22 +37,24 @@ extra-y += $(call logo-cfiles,_clut224,ppm)
 # Gray 256
 extra-y += $(call logo-cfiles,_gray256,pgm)
 
+pnmtlogo := scripts/pnmtologo
+
 # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
 quiet_cmd_logo = LOGO    $@
-	cmd_logo = scripts/pnmtologo \
+	cmd_logo = $(pnmtologo) \
 			-t $(patsubst $*_%,%,$(notdir $(basename $<))) \
 			-n $(notdir $(basename $<)) -o $@ $<
 
-$(obj)/%_mono.c: $(src)/%_mono.pbm FORCE
+$(obj)/%_mono.c: $(src)/%_mono.pbm $(pnmtlogo) FORCE
 	$(call if_changed,logo)
 
-$(obj)/%_vga16.c: $(src)/%_vga16.ppm FORCE
+$(obj)/%_vga16.c: $(src)/%_vga16.ppm $(pnmtlogo) FORCE
 	$(call if_changed,logo)
 
-$(obj)/%_clut224.c: $(src)/%_clut224.ppm FORCE
+$(obj)/%_clut224.c: $(src)/%_clut224.ppm $(pnmtlogo) FORCE
 	$(call if_changed,logo)
 
-$(obj)/%_gray256.c: $(src)/%_gray256.pgm FORCE
+$(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtlogo) FORCE
 	$(call if_changed,logo)
 
 # Files generated that shall be removed upon make clean