2005-08-27 Marco Gerards <metgerards@student.han.nl>

	* conf/powerpc-ieee1275.rmk (pkgdata_MODULES): Fix typo (use
	`gzio.mod' instead of `io.mod').

diff --git a/ChangeLog b/ChangeLog
index 0dbbce32e96cc82148adeac835322ebb794edc66..73c88a27b7fe51d8531ecce165690ce2113d958d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-27  Marco Gerards  <metgerards@student.han.nl>
+
+       * conf/powerpc-ieee1275.rmk (pkgdata_MODULES): Fix typo (use
+       `gzio.mod' instead of `io.mod').
+
 2005-08-22  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * gendistlist.sh (EXTRA_DISTFILES): Added genfslist.sh.
@@ -610,7 +615,7 @@
        (grub_console_term): New member `getwh'.
        * term/i386/pc/vga.c (grub_vga_getwh): New function.
        (grub_vga_term): New member `getwh'.
-       * term/sparc64/ofconsole.c (grub_ofconsole_readkey): Use
+       * term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Use
        grub_ssize_t.
        (grub_ofconsole_getw): New function.
        (grub_ofconsole_init): Use grub_ssize_t and unsigned char.

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index 4c130eefaba69773d33711cbbd84dad51241959f..9243f3892771e8bd86003a77887cab2a7b55cff6 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -756,7 +756,7 @@ pkgdata_MODULES = _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
        hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
        boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
        pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod sun.mod \
-       default.mod timeout.mod configfile.mod search.mod io.mod
+       default.mod timeout.mod configfile.mod search.mod gzio.mod
 
 # For fshelp.mod.
 fshelp_mod_SOURCES = fs/fshelp.c
@@ -2439,6 +2439,52 @@ search_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For gzio.mod.
 gzio_mod_SOURCES = io/gzio.c
+CLEANFILES += gzio.mod mod-gzio.o mod-gzio.c pre-gzio.o gzio_mod-io_gzio.o def-gzio.lst und-gzio.lst
+MOSTLYCLEANFILES += gzio_mod-io_gzio.d
+DEFSYMFILES += def-gzio.lst
+UNDSYMFILES += und-gzio.lst
+
+gzio.mod: pre-gzio.o mod-gzio.o
+       -rm -f $@
+       $(LD) -r -d -o $@ $^
+       $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-gzio.o: gzio_mod-io_gzio.o
+       -rm -f $@
+       $(LD) -r -d -o $@ $^
+
+mod-gzio.o: mod-gzio.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -c -o $@ $<
+
+mod-gzio.c: moddep.lst genmodsrc.sh
+       sh $(srcdir)/genmodsrc.sh 'gzio' $< > $@ || (rm -f $@; exit 1)
+
+def-gzio.lst: pre-gzio.o
+       $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 gzio/' > $@
+
+und-gzio.lst: pre-gzio.o
+       echo 'gzio' > $@
+       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+gzio_mod-io_gzio.o: io/gzio.c
+       $(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -c -o $@ $<
+
+gzio_mod-io_gzio.d: io/gzio.c
+       set -e;           $(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -M $<        | sed 's,gzio\.o[ :]*,gzio_mod-io_gzio.o $@ : ,g' > $@;         [ -s $@ ] || rm -f $@
+
+-include gzio_mod-io_gzio.d
+
+CLEANFILES += cmd-gzio.lst fs-gzio.lst
+COMMANDFILES += cmd-gzio.lst
+FSFILES += fs-gzio.lst
+
+cmd-gzio.lst: io/gzio.c gencmdlist.sh
+       set -e;           $(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -E $<        | sh $(srcdir)/gencmdlist.sh gzio > $@ || (rm -f $@; exit 1)
+
+fs-gzio.lst: io/gzio.c genfslist.sh
+       set -e;           $(CC) -Iio -I$(srcdir)/io $(CPPFLAGS) $(CFLAGS) $(gzio_mod_CFLAGS) -E $<        | sh $(srcdir)/genfslist.sh gzio > $@ || (rm -f $@; exit 1)
+
+
 gzio_mod_CFLAGS = $(COMMON_CFLAGS)
 CLEANFILES += moddep.lst command.lst fs.lst
 pkgdata_DATA += moddep.lst command.lst fs.lst

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index c155d633456ebc10f262959183d0f9455bd9f704..74b4975303eb3564b52e1b585da8fe3496109e16 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -76,7 +76,7 @@ pkgdata_MODULES = _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
        hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
        boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
        pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod sun.mod \
-       default.mod timeout.mod configfile.mod search.mod io.mod
+       default.mod timeout.mod configfile.mod search.mod gzio.mod
 
 # For fshelp.mod.
 fshelp_mod_SOURCES = fs/fshelp.c