vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix $srcdir != $builddir build by moving ascii.h to top dir.

Browse source
This commit is contained in:
Robert Millan 2010-01-14 22:17:05 +01:00
parent 885d1a8d90
commit b4f58b4aec
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog.kernel-font
View file

@ -6,7 +6,7 @@
* font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK. * font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
By default: disabled. By default: disabled.
* Makefile.in (font/ascii.h): Remove the non-needed grub/bin2h size * Makefile.in (ascii.h): Remove the non-needed grub/bin2h size
parameter. parameter.
2010-01-10 Carles Pina i Estany <carles@pina.cat> 2010-01-10 Carles Pina i Estany <carles@pina.cat>
@ -32,7 +32,7 @@
(write_font_p2): ... this. Remove print_glyphs call. (write_font_p2): ... this. Remove print_glyphs call.
(main): Use file_format. Implement code for ranges if ascii-bitmaps is (main): Use file_format. Implement code for ranges if ascii-bitmaps is
used. Call print_glyphs. used. Call print_glyphs.
* Makefile.in (pkgdata_DATA): Add `font/ascii.h'. * Makefile.in (pkgdata_DATA): Add `ascii.h'.
2010-01-14 Robert Millan <rmh.grub@aybabtu.com> 2010-01-14 Robert Millan <rmh.grub@aybabtu.com>

8
Makefile.in
View file

@ -234,7 +234,7 @@ else
ifeq ($(enable_grub_mkfont),yes) ifeq ($(enable_grub_mkfont),yes)
pkgdata_DATA += unicode.pf2 ascii.pf2 font/ascii.h pkgdata_DATA += unicode.pf2 ascii.pf2 ascii.h
# Arrows and lines are needed to draw the menu, so we always include them # Arrows and lines are needed to draw the menu, so we always include them
UNICODE_ARROWS=0x2190-0x2193 UNICODE_ARROWS=0x2190-0x2193
@ -246,11 +246,11 @@ unicode.pf2: $(FONT_SOURCE) grub-mkfont
ascii.pf2: $(FONT_SOURCE) grub-mkfont ascii.pf2: $(FONT_SOURCE) grub-mkfont
$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES) $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
font/ascii.bitmaps: $(FONT_SOURCE) grub-mkfont ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE) $(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
font/ascii.h: font/ascii.bitmaps grub-bin2h ascii.h: ascii.bitmaps grub-bin2h
$(builddir)/grub-bin2h ascii_bitmaps < font/ascii.bitmaps > font/ascii.h $(builddir)/grub-bin2h ascii_bitmaps < $< > $@
TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1 TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1
endif endif