grub-fstest needs the host and hostfs modules while other utilities

actively require those modules to be absent, so grub-fstest needs
its own initialisation and finalisation code.
* Makefile.am (grub_fstest.pp): New target.
(grub_fstest_init.lst): Likewise.
(grub_fstest_init.c): Likewise.
* Makefile.util.def (grub-fstest): Add grub_fstest_init.c.

diff --git a/ChangeLog b/ChangeLog
index f2b1e9dcd1651ff7f01c7443ac44d78517f3bd7a..c5d0760a675bf357027f8e6c574b91fa7fb31173 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-10  Colin Watson  <cjwatson@ubuntu.com>
+
+       grub-fstest needs the host and hostfs modules while other utilities
+       actively require those modules to be absent, so grub-fstest needs
+       its own initialisation and finalisation code.
+
+       * Makefile.am (grub_fstest.pp): New target.
+       (grub_fstest_init.lst): Likewise.
+       (grub_fstest_init.c): Likewise.
+       * Makefile.util.def (grub-fstest): Add grub_fstest_init.c.
+
 2010-09-10  Robert Millan  <rmh@gnu.org>
 
        * configure.ac: Check for `struct statfs.f_fstypename' and

diff --git a/Makefile.am b/Makefile.am
index 1cf2297bd01a143db3f326b5540d1b0bbd42a540..e0f2f013fd778c7ac56d28330bb06098dd568fc7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,20 @@ libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh
        sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
 CLEANFILES += libgrub_a_init.c
 
+# For grub-fstest
+grub_fstest.pp: $(grub_fstest_SOURCES)
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(grub_fstest_CPPFLAGS) $(CPPFLAGS) \
+         -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest.pp
+
+grub_fstest_init.lst: libgrub.pp grub_fstest.pp
+       cat $^ | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest_init.lst
+
+grub_fstest_init.c: grub_fstest_init.lst $(top_srcdir)/geninit.sh
+       sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest_init.c
+
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
 grubdata_DATA = unicode.pf2 ascii.pf2 ascii.h widthspec.h

diff --git a/Makefile.util.def b/Makefile.util.def
index 5ef33c5dbf48c4bfb014ac31fb6eb2895ed9f390..5d4724b8ffe1af7329b5f02873100cc2976ce9ef 100644 (file)
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -179,6 +179,7 @@ program = {
 program = {
   name = grub-fstest;
   mansection = 1;
+  common_nodist = grub_fstest_init.c;
   common = util/grub-fstest.c;
   common = grub-core/kern/emu/hostfs.c;
   common = grub-core/disk/host.c;