2010-01-18 Robert Millan <rmh.grub@aybabtu.com>

	* include/grub/term.h (grub_term_register_input,
	grub_term_register_output): Check return of terminal init()
	routines, and abort if errors are raised.

	* commands/terminal.c: Update copyright year.

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index 576c85904897abda4a845df7f5e09d6bc70cb06c..73f8a895e551c08dbe8a0e75e2734e4779b01d38 100644 (file)
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -1,3 +1,10 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Fix parallel builds.
+
+       * conf/common.rmk (font/font.c_DEPENDENCIES): New variable (makes
+       font.c depend on ascii.h).
+
 2010-01-12  Carles Pina i Estany  <carles@pina.cat>
 
        * Makefile.in (DUSE_ASCII_FAILBACK): New macro.

diff --git a/conf/common.rmk b/conf/common.rmk
index a83bd0fcaf8e15b54f42e56f9daa167649555032..956ed8ec349a5a05845365d3979a8829113061b2 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -600,7 +600,7 @@ sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # Common Video Subsystem specific modules.
 pkglib_MODULES += video.mod videotest.mod bitmap.mod tga.mod jpeg.mod  \
-       png.mod font.mod gfxterm.mod video_fb.mod
+       png.mod gfxterm.mod video_fb.mod
 
 # For video.mod.
 video_mod_SOURCES = video/video.c
@@ -637,7 +637,8 @@ png_mod_SOURCES = video/readers/png.c
 png_mod_CFLAGS = $(COMMON_CFLAGS)
 png_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For font.mod.
+pkglib_MODULES += font.mod
+font/font.c_DEPENDENCIES = ascii.h
 font_mod_SOURCES = font/font_cmd.c font/font.c
 font_mod_CFLAGS = $(COMMON_CFLAGS)
 font_mod_LDFLAGS = $(COMMON_LDFLAGS)