diff --git a/ChangeLog b/ChangeLog
index ce9286734..a192568e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+2005-11-18  Timothy Baldwin  <T.E.Baldwin99@members.leeds.ac.uk>
+
+	* genmk.rb: Fixed list rules moved to Makefile.in.  Recognise
+	appending to variables with "+=".
+	(PModule): Use full pathname to generate *.lst filenames.
+
+	* Makefile.in: Fixed list rules moved from genmk.rb.
+	(.DELETE_ON_ERROR): New special target.
+	(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
+
+	* conf/i386-pc.rmk: Include conf/common.mk.
+	(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
+	minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
+	hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
+	help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
+	sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
+	configfile.mod, search.mod, gzio.mod and test.mod.
+	(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
+	(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
+	(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
+	(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
+	(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
+	(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
+	(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
+	(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
+	(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
+	(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
+	(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
+	(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
+	(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
+	(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
+	(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
+	(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
+	(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
+	(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
+	(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
+	(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
+	(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
+	(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
+	(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
+	here...
+	* conf/common.rmk: ... to here.  New file.
+
+	* conf/common.mk: New file.
+
 2005-11-18  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* conf/powerpc-ieee1275.rmk (grub_script.tab.h): Unified to ...
diff --git a/Makefile.in b/Makefile.in
index 11cfde93d..703971ca1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,8 @@ LIBLZO = @LIBLZO@
 
 ### General variables.
 
-RMKFILES = $(addprefix conf/,i386-pc.rmk powerpc-ieee1275.rmk)
+RMKFILES = $(addprefix conf/,common.rmk i386-pc.rmk powerpc-ieee1275.rmk \
+	sparc64-ieee1275.rmk)
 MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
 
 DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS) \
@@ -100,6 +101,18 @@ include $(srcdir)/conf/$(host_cpu)-$(host_vendor).mk
 
 ### General targets.
 
+CLEANFILES += moddep.lst command.lst fs.lst
+pkgdata_DATA += moddep.lst command.lst fs.lst
+moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
+	cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
+	  || (rm -f $@; exit 1)
+
+command.lst: $(COMMANDFILES)
+	cat $^ /dev/null | sort > $@
+
+fs.lst: $(FSFILES)
+	cat $^ /dev/null | sort > $@
+
 all-local: $(PROGRAMS) $(DATA) $(SCRIPTS) $(MKFILES)
 
 install: install-local
@@ -241,3 +254,5 @@ config.status: configure
 
 # Prevent an overflow.
 .NOEXPORT:
+
+.DELETE_ON_ERROR:
diff --git a/conf/common.mk b/conf/common.mk
new file mode 100644
index 000000000..0de5a1ebc
--- /dev/null
+++ b/conf/common.mk
@@ -0,0 +1,1645 @@
+# -*- makefile -*-
+
+# For the parser.
+grub_script.tab.c grub_script.tab.h: normal/parser.y
+	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
+
+# For grub-emu.
+grub_modules_init.lst: geninit.sh
+	(cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
+
+grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
+	sh $(srcdir)/geninitheader.sh > $@
+
+grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
+	sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
+
+
+
+# Filing systems.
+pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod		\
+	minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod affs.mod	\
+	sfs.mod
+
+# For fshelp.mod.
+fshelp_mod_SOURCES = fs/fshelp.c
+CLEANFILES += fshelp.mod mod-fshelp.o mod-fshelp.c pre-fshelp.o fshelp_mod-fs_fshelp.o def-fshelp.lst und-fshelp.lst
+MOSTLYCLEANFILES += fshelp_mod-fs_fshelp.d
+DEFSYMFILES += def-fshelp.lst
+UNDSYMFILES += und-fshelp.lst
+
+fshelp.mod: pre-fshelp.o mod-fshelp.o
+	-rm -f $@
+	$(LD) $(fshelp_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-fshelp.o: fshelp_mod-fs_fshelp.o
+	-rm -f $@
+	$(LD) $(fshelp_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-fshelp.o: mod-fshelp.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -c -o $@ $<
+
+mod-fshelp.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'fshelp' $< > $@ || (rm -f $@; exit 1)
+
+def-fshelp.lst: pre-fshelp.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 fshelp/' > $@
+
+und-fshelp.lst: pre-fshelp.o
+	echo 'fshelp' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+fshelp_mod-fs_fshelp.o: fs/fshelp.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -c -o $@ $<
+
+fshelp_mod-fs_fshelp.d: fs/fshelp.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -M $< 	  | sed 's,fshelp\.o[ :]*,fshelp_mod-fs_fshelp.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include fshelp_mod-fs_fshelp.d
+
+CLEANFILES += cmd-fshelp_mod-fs_fshelp.lst fs-fshelp_mod-fs_fshelp.lst
+COMMANDFILES += cmd-fshelp_mod-fs_fshelp.lst
+FSFILES += fs-fshelp_mod-fs_fshelp.lst
+
+cmd-fshelp_mod-fs_fshelp.lst: fs/fshelp.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh fshelp > $@ || (rm -f $@; exit 1)
+
+fs-fshelp_mod-fs_fshelp.lst: fs/fshelp.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh fshelp > $@ || (rm -f $@; exit 1)
+
+
+fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
+fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For fat.mod.
+fat_mod_SOURCES = fs/fat.c
+CLEANFILES += fat.mod mod-fat.o mod-fat.c pre-fat.o fat_mod-fs_fat.o def-fat.lst und-fat.lst
+MOSTLYCLEANFILES += fat_mod-fs_fat.d
+DEFSYMFILES += def-fat.lst
+UNDSYMFILES += und-fat.lst
+
+fat.mod: pre-fat.o mod-fat.o
+	-rm -f $@
+	$(LD) $(fat_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-fat.o: fat_mod-fs_fat.o
+	-rm -f $@
+	$(LD) $(fat_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-fat.o: mod-fat.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -c -o $@ $<
+
+mod-fat.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'fat' $< > $@ || (rm -f $@; exit 1)
+
+def-fat.lst: pre-fat.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 fat/' > $@
+
+und-fat.lst: pre-fat.o
+	echo 'fat' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+fat_mod-fs_fat.o: fs/fat.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -c -o $@ $<
+
+fat_mod-fs_fat.d: fs/fat.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -M $< 	  | sed 's,fat\.o[ :]*,fat_mod-fs_fat.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include fat_mod-fs_fat.d
+
+CLEANFILES += cmd-fat_mod-fs_fat.lst fs-fat_mod-fs_fat.lst
+COMMANDFILES += cmd-fat_mod-fs_fat.lst
+FSFILES += fs-fat_mod-fs_fat.lst
+
+cmd-fat_mod-fs_fat.lst: fs/fat.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh fat > $@ || (rm -f $@; exit 1)
+
+fs-fat_mod-fs_fat.lst: fs/fat.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh fat > $@ || (rm -f $@; exit 1)
+
+
+fat_mod_CFLAGS = $(COMMON_CFLAGS)
+fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ufs.mod.
+ufs_mod_SOURCES = fs/ufs.c
+CLEANFILES += ufs.mod mod-ufs.o mod-ufs.c pre-ufs.o ufs_mod-fs_ufs.o def-ufs.lst und-ufs.lst
+MOSTLYCLEANFILES += ufs_mod-fs_ufs.d
+DEFSYMFILES += def-ufs.lst
+UNDSYMFILES += und-ufs.lst
+
+ufs.mod: pre-ufs.o mod-ufs.o
+	-rm -f $@
+	$(LD) $(ufs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-ufs.o: ufs_mod-fs_ufs.o
+	-rm -f $@
+	$(LD) $(ufs_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-ufs.o: mod-ufs.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -c -o $@ $<
+
+mod-ufs.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'ufs' $< > $@ || (rm -f $@; exit 1)
+
+def-ufs.lst: pre-ufs.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 ufs/' > $@
+
+und-ufs.lst: pre-ufs.o
+	echo 'ufs' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+ufs_mod-fs_ufs.o: fs/ufs.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -c -o $@ $<
+
+ufs_mod-fs_ufs.d: fs/ufs.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -M $< 	  | sed 's,ufs\.o[ :]*,ufs_mod-fs_ufs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include ufs_mod-fs_ufs.d
+
+CLEANFILES += cmd-ufs_mod-fs_ufs.lst fs-ufs_mod-fs_ufs.lst
+COMMANDFILES += cmd-ufs_mod-fs_ufs.lst
+FSFILES += fs-ufs_mod-fs_ufs.lst
+
+cmd-ufs_mod-fs_ufs.lst: fs/ufs.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ufs > $@ || (rm -f $@; exit 1)
+
+fs-ufs_mod-fs_ufs.lst: fs/ufs.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ufs > $@ || (rm -f $@; exit 1)
+
+
+ufs_mod_CFLAGS = $(COMMON_CFLAGS)
+ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ext2.mod.
+ext2_mod_SOURCES = fs/ext2.c
+CLEANFILES += ext2.mod mod-ext2.o mod-ext2.c pre-ext2.o ext2_mod-fs_ext2.o def-ext2.lst und-ext2.lst
+MOSTLYCLEANFILES += ext2_mod-fs_ext2.d
+DEFSYMFILES += def-ext2.lst
+UNDSYMFILES += und-ext2.lst
+
+ext2.mod: pre-ext2.o mod-ext2.o
+	-rm -f $@
+	$(LD) $(ext2_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-ext2.o: ext2_mod-fs_ext2.o
+	-rm -f $@
+	$(LD) $(ext2_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-ext2.o: mod-ext2.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -c -o $@ $<
+
+mod-ext2.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'ext2' $< > $@ || (rm -f $@; exit 1)
+
+def-ext2.lst: pre-ext2.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 ext2/' > $@
+
+und-ext2.lst: pre-ext2.o
+	echo 'ext2' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+ext2_mod-fs_ext2.o: fs/ext2.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -c -o $@ $<
+
+ext2_mod-fs_ext2.d: fs/ext2.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -M $< 	  | sed 's,ext2\.o[ :]*,ext2_mod-fs_ext2.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include ext2_mod-fs_ext2.d
+
+CLEANFILES += cmd-ext2_mod-fs_ext2.lst fs-ext2_mod-fs_ext2.lst
+COMMANDFILES += cmd-ext2_mod-fs_ext2.lst
+FSFILES += fs-ext2_mod-fs_ext2.lst
+
+cmd-ext2_mod-fs_ext2.lst: fs/ext2.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ext2 > $@ || (rm -f $@; exit 1)
+
+fs-ext2_mod-fs_ext2.lst: fs/ext2.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ext2 > $@ || (rm -f $@; exit 1)
+
+
+ext2_mod_CFLAGS = $(COMMON_CFLAGS)
+ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For minix.mod.
+minix_mod_SOURCES = fs/minix.c
+CLEANFILES += minix.mod mod-minix.o mod-minix.c pre-minix.o minix_mod-fs_minix.o def-minix.lst und-minix.lst
+MOSTLYCLEANFILES += minix_mod-fs_minix.d
+DEFSYMFILES += def-minix.lst
+UNDSYMFILES += und-minix.lst
+
+minix.mod: pre-minix.o mod-minix.o
+	-rm -f $@
+	$(LD) $(minix_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-minix.o: minix_mod-fs_minix.o
+	-rm -f $@
+	$(LD) $(minix_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-minix.o: mod-minix.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -c -o $@ $<
+
+mod-minix.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'minix' $< > $@ || (rm -f $@; exit 1)
+
+def-minix.lst: pre-minix.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 minix/' > $@
+
+und-minix.lst: pre-minix.o
+	echo 'minix' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+minix_mod-fs_minix.o: fs/minix.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -c -o $@ $<
+
+minix_mod-fs_minix.d: fs/minix.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -M $< 	  | sed 's,minix\.o[ :]*,minix_mod-fs_minix.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include minix_mod-fs_minix.d
+
+CLEANFILES += cmd-minix_mod-fs_minix.lst fs-minix_mod-fs_minix.lst
+COMMANDFILES += cmd-minix_mod-fs_minix.lst
+FSFILES += fs-minix_mod-fs_minix.lst
+
+cmd-minix_mod-fs_minix.lst: fs/minix.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh minix > $@ || (rm -f $@; exit 1)
+
+fs-minix_mod-fs_minix.lst: fs/minix.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh minix > $@ || (rm -f $@; exit 1)
+
+
+minix_mod_CFLAGS = $(COMMON_CFLAGS)
+minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For hfs.mod.
+hfs_mod_SOURCES = fs/hfs.c
+CLEANFILES += hfs.mod mod-hfs.o mod-hfs.c pre-hfs.o hfs_mod-fs_hfs.o def-hfs.lst und-hfs.lst
+MOSTLYCLEANFILES += hfs_mod-fs_hfs.d
+DEFSYMFILES += def-hfs.lst
+UNDSYMFILES += und-hfs.lst
+
+hfs.mod: pre-hfs.o mod-hfs.o
+	-rm -f $@
+	$(LD) $(hfs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-hfs.o: hfs_mod-fs_hfs.o
+	-rm -f $@
+	$(LD) $(hfs_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-hfs.o: mod-hfs.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -c -o $@ $<
+
+mod-hfs.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'hfs' $< > $@ || (rm -f $@; exit 1)
+
+def-hfs.lst: pre-hfs.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 hfs/' > $@
+
+und-hfs.lst: pre-hfs.o
+	echo 'hfs' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+hfs_mod-fs_hfs.o: fs/hfs.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -c -o $@ $<
+
+hfs_mod-fs_hfs.d: fs/hfs.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -M $< 	  | sed 's,hfs\.o[ :]*,hfs_mod-fs_hfs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include hfs_mod-fs_hfs.d
+
+CLEANFILES += cmd-hfs_mod-fs_hfs.lst fs-hfs_mod-fs_hfs.lst
+COMMANDFILES += cmd-hfs_mod-fs_hfs.lst
+FSFILES += fs-hfs_mod-fs_hfs.lst
+
+cmd-hfs_mod-fs_hfs.lst: fs/hfs.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh hfs > $@ || (rm -f $@; exit 1)
+
+fs-hfs_mod-fs_hfs.lst: fs/hfs.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh hfs > $@ || (rm -f $@; exit 1)
+
+
+hfs_mod_CFLAGS = $(COMMON_CFLAGS)
+hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For jfs.mod.
+jfs_mod_SOURCES = fs/jfs.c
+CLEANFILES += jfs.mod mod-jfs.o mod-jfs.c pre-jfs.o jfs_mod-fs_jfs.o def-jfs.lst und-jfs.lst
+MOSTLYCLEANFILES += jfs_mod-fs_jfs.d
+DEFSYMFILES += def-jfs.lst
+UNDSYMFILES += und-jfs.lst
+
+jfs.mod: pre-jfs.o mod-jfs.o
+	-rm -f $@
+	$(LD) $(jfs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-jfs.o: jfs_mod-fs_jfs.o
+	-rm -f $@
+	$(LD) $(jfs_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-jfs.o: mod-jfs.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -c -o $@ $<
+
+mod-jfs.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'jfs' $< > $@ || (rm -f $@; exit 1)
+
+def-jfs.lst: pre-jfs.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 jfs/' > $@
+
+und-jfs.lst: pre-jfs.o
+	echo 'jfs' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+jfs_mod-fs_jfs.o: fs/jfs.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -c -o $@ $<
+
+jfs_mod-fs_jfs.d: fs/jfs.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -M $< 	  | sed 's,jfs\.o[ :]*,jfs_mod-fs_jfs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include jfs_mod-fs_jfs.d
+
+CLEANFILES += cmd-jfs_mod-fs_jfs.lst fs-jfs_mod-fs_jfs.lst
+COMMANDFILES += cmd-jfs_mod-fs_jfs.lst
+FSFILES += fs-jfs_mod-fs_jfs.lst
+
+cmd-jfs_mod-fs_jfs.lst: fs/jfs.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh jfs > $@ || (rm -f $@; exit 1)
+
+fs-jfs_mod-fs_jfs.lst: fs/jfs.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh jfs > $@ || (rm -f $@; exit 1)
+
+
+jfs_mod_CFLAGS = $(COMMON_CFLAGS)
+jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For iso9660.mod.
+iso9660_mod_SOURCES = fs/iso9660.c
+CLEANFILES += iso9660.mod mod-iso9660.o mod-iso9660.c pre-iso9660.o iso9660_mod-fs_iso9660.o def-iso9660.lst und-iso9660.lst
+MOSTLYCLEANFILES += iso9660_mod-fs_iso9660.d
+DEFSYMFILES += def-iso9660.lst
+UNDSYMFILES += und-iso9660.lst
+
+iso9660.mod: pre-iso9660.o mod-iso9660.o
+	-rm -f $@
+	$(LD) $(iso9660_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-iso9660.o: iso9660_mod-fs_iso9660.o
+	-rm -f $@
+	$(LD) $(iso9660_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-iso9660.o: mod-iso9660.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(iso9660_mod_CFLAGS) -c -o $@ $<
+
+mod-iso9660.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'iso9660' $< > $@ || (rm -f $@; exit 1)
+
+def-iso9660.lst: pre-iso9660.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 iso9660/' > $@
+
+und-iso9660.lst: pre-iso9660.o
+	echo 'iso9660' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+iso9660_mod-fs_iso9660.o: fs/iso9660.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(iso9660_mod_CFLAGS) -c -o $@ $<
+
+iso9660_mod-fs_iso9660.d: fs/iso9660.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(iso9660_mod_CFLAGS) -M $< 	  | sed 's,iso9660\.o[ :]*,iso9660_mod-fs_iso9660.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include iso9660_mod-fs_iso9660.d
+
+CLEANFILES += cmd-iso9660_mod-fs_iso9660.lst fs-iso9660_mod-fs_iso9660.lst
+COMMANDFILES += cmd-iso9660_mod-fs_iso9660.lst
+FSFILES += fs-iso9660_mod-fs_iso9660.lst
+
+cmd-iso9660_mod-fs_iso9660.lst: fs/iso9660.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(iso9660_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh iso9660 > $@ || (rm -f $@; exit 1)
+
+fs-iso9660_mod-fs_iso9660.lst: fs/iso9660.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(iso9660_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh iso9660 > $@ || (rm -f $@; exit 1)
+
+
+iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
+iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For xfs.mod.
+xfs_mod_SOURCES = fs/xfs.c
+CLEANFILES += xfs.mod mod-xfs.o mod-xfs.c pre-xfs.o xfs_mod-fs_xfs.o def-xfs.lst und-xfs.lst
+MOSTLYCLEANFILES += xfs_mod-fs_xfs.d
+DEFSYMFILES += def-xfs.lst
+UNDSYMFILES += und-xfs.lst
+
+xfs.mod: pre-xfs.o mod-xfs.o
+	-rm -f $@
+	$(LD) $(xfs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-xfs.o: xfs_mod-fs_xfs.o
+	-rm -f $@
+	$(LD) $(xfs_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-xfs.o: mod-xfs.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -c -o $@ $<
+
+mod-xfs.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'xfs' $< > $@ || (rm -f $@; exit 1)
+
+def-xfs.lst: pre-xfs.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 xfs/' > $@
+
+und-xfs.lst: pre-xfs.o
+	echo 'xfs' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+xfs_mod-fs_xfs.o: fs/xfs.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -c -o $@ $<
+
+xfs_mod-fs_xfs.d: fs/xfs.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -M $< 	  | sed 's,xfs\.o[ :]*,xfs_mod-fs_xfs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include xfs_mod-fs_xfs.d
+
+CLEANFILES += cmd-xfs_mod-fs_xfs.lst fs-xfs_mod-fs_xfs.lst
+COMMANDFILES += cmd-xfs_mod-fs_xfs.lst
+FSFILES += fs-xfs_mod-fs_xfs.lst
+
+cmd-xfs_mod-fs_xfs.lst: fs/xfs.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh xfs > $@ || (rm -f $@; exit 1)
+
+fs-xfs_mod-fs_xfs.lst: fs/xfs.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh xfs > $@ || (rm -f $@; exit 1)
+
+
+xfs_mod_CFLAGS = $(COMMON_CFLAGS)
+xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For affs.mod.
+affs_mod_SOURCES = fs/affs.c
+CLEANFILES += affs.mod mod-affs.o mod-affs.c pre-affs.o affs_mod-fs_affs.o def-affs.lst und-affs.lst
+MOSTLYCLEANFILES += affs_mod-fs_affs.d
+DEFSYMFILES += def-affs.lst
+UNDSYMFILES += und-affs.lst
+
+affs.mod: pre-affs.o mod-affs.o
+	-rm -f $@
+	$(LD) $(affs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-affs.o: affs_mod-fs_affs.o
+	-rm -f $@
+	$(LD) $(affs_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-affs.o: mod-affs.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -c -o $@ $<
+
+mod-affs.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'affs' $< > $@ || (rm -f $@; exit 1)
+
+def-affs.lst: pre-affs.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 affs/' > $@
+
+und-affs.lst: pre-affs.o
+	echo 'affs' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+affs_mod-fs_affs.o: fs/affs.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -c -o $@ $<
+
+affs_mod-fs_affs.d: fs/affs.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -M $< 	  | sed 's,affs\.o[ :]*,affs_mod-fs_affs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include affs_mod-fs_affs.d
+
+CLEANFILES += cmd-affs_mod-fs_affs.lst fs-affs_mod-fs_affs.lst
+COMMANDFILES += cmd-affs_mod-fs_affs.lst
+FSFILES += fs-affs_mod-fs_affs.lst
+
+cmd-affs_mod-fs_affs.lst: fs/affs.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh affs > $@ || (rm -f $@; exit 1)
+
+fs-affs_mod-fs_affs.lst: fs/affs.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh affs > $@ || (rm -f $@; exit 1)
+
+
+affs_mod_CFLAGS = $(COMMON_CFLAGS)
+affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sfs.mod.
+sfs_mod_SOURCES = fs/sfs.c
+CLEANFILES += sfs.mod mod-sfs.o mod-sfs.c pre-sfs.o sfs_mod-fs_sfs.o def-sfs.lst und-sfs.lst
+MOSTLYCLEANFILES += sfs_mod-fs_sfs.d
+DEFSYMFILES += def-sfs.lst
+UNDSYMFILES += und-sfs.lst
+
+sfs.mod: pre-sfs.o mod-sfs.o
+	-rm -f $@
+	$(LD) $(sfs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-sfs.o: sfs_mod-fs_sfs.o
+	-rm -f $@
+	$(LD) $(sfs_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-sfs.o: mod-sfs.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -c -o $@ $<
+
+mod-sfs.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'sfs' $< > $@ || (rm -f $@; exit 1)
+
+def-sfs.lst: pre-sfs.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 sfs/' > $@
+
+und-sfs.lst: pre-sfs.o
+	echo 'sfs' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+sfs_mod-fs_sfs.o: fs/sfs.c
+	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -c -o $@ $<
+
+sfs_mod-fs_sfs.d: fs/sfs.c
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -M $< 	  | sed 's,sfs\.o[ :]*,sfs_mod-fs_sfs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include sfs_mod-fs_sfs.d
+
+CLEANFILES += cmd-sfs_mod-fs_sfs.lst fs-sfs_mod-fs_sfs.lst
+COMMANDFILES += cmd-sfs_mod-fs_sfs.lst
+FSFILES += fs-sfs_mod-fs_sfs.lst
+
+cmd-sfs_mod-fs_sfs.lst: fs/sfs.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh sfs > $@ || (rm -f $@; exit 1)
+
+fs-sfs_mod-fs_sfs.lst: fs/sfs.c genfslist.sh
+	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh sfs > $@ || (rm -f $@; exit 1)
+
+
+sfs_mod_CFLAGS = $(COMMON_CFLAGS)
+sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+
+# Partiton maps.
+pkgdata_MODULES += amiga.mod apple.mod pc.mod sun.mod acorn.mod
+
+# For amiga.mod
+amiga_mod_SOURCES = partmap/amiga.c
+CLEANFILES += amiga.mod mod-amiga.o mod-amiga.c pre-amiga.o amiga_mod-partmap_amiga.o def-amiga.lst und-amiga.lst
+MOSTLYCLEANFILES += amiga_mod-partmap_amiga.d
+DEFSYMFILES += def-amiga.lst
+UNDSYMFILES += und-amiga.lst
+
+amiga.mod: pre-amiga.o mod-amiga.o
+	-rm -f $@
+	$(LD) $(amiga_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-amiga.o: amiga_mod-partmap_amiga.o
+	-rm -f $@
+	$(LD) $(amiga_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-amiga.o: mod-amiga.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -c -o $@ $<
+
+mod-amiga.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'amiga' $< > $@ || (rm -f $@; exit 1)
+
+def-amiga.lst: pre-amiga.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 amiga/' > $@
+
+und-amiga.lst: pre-amiga.o
+	echo 'amiga' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+amiga_mod-partmap_amiga.o: partmap/amiga.c
+	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -c -o $@ $<
+
+amiga_mod-partmap_amiga.d: partmap/amiga.c
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -M $< 	  | sed 's,amiga\.o[ :]*,amiga_mod-partmap_amiga.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include amiga_mod-partmap_amiga.d
+
+CLEANFILES += cmd-amiga_mod-partmap_amiga.lst fs-amiga_mod-partmap_amiga.lst
+COMMANDFILES += cmd-amiga_mod-partmap_amiga.lst
+FSFILES += fs-amiga_mod-partmap_amiga.lst
+
+cmd-amiga_mod-partmap_amiga.lst: partmap/amiga.c gencmdlist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh amiga > $@ || (rm -f $@; exit 1)
+
+fs-amiga_mod-partmap_amiga.lst: partmap/amiga.c genfslist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh amiga > $@ || (rm -f $@; exit 1)
+
+
+amiga_mod_CFLAGS = $(COMMON_CFLAGS)
+amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For apple.mod
+apple_mod_SOURCES = partmap/apple.c
+CLEANFILES += apple.mod mod-apple.o mod-apple.c pre-apple.o apple_mod-partmap_apple.o def-apple.lst und-apple.lst
+MOSTLYCLEANFILES += apple_mod-partmap_apple.d
+DEFSYMFILES += def-apple.lst
+UNDSYMFILES += und-apple.lst
+
+apple.mod: pre-apple.o mod-apple.o
+	-rm -f $@
+	$(LD) $(apple_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-apple.o: apple_mod-partmap_apple.o
+	-rm -f $@
+	$(LD) $(apple_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-apple.o: mod-apple.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -c -o $@ $<
+
+mod-apple.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'apple' $< > $@ || (rm -f $@; exit 1)
+
+def-apple.lst: pre-apple.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 apple/' > $@
+
+und-apple.lst: pre-apple.o
+	echo 'apple' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+apple_mod-partmap_apple.o: partmap/apple.c
+	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -c -o $@ $<
+
+apple_mod-partmap_apple.d: partmap/apple.c
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -M $< 	  | sed 's,apple\.o[ :]*,apple_mod-partmap_apple.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include apple_mod-partmap_apple.d
+
+CLEANFILES += cmd-apple_mod-partmap_apple.lst fs-apple_mod-partmap_apple.lst
+COMMANDFILES += cmd-apple_mod-partmap_apple.lst
+FSFILES += fs-apple_mod-partmap_apple.lst
+
+cmd-apple_mod-partmap_apple.lst: partmap/apple.c gencmdlist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh apple > $@ || (rm -f $@; exit 1)
+
+fs-apple_mod-partmap_apple.lst: partmap/apple.c genfslist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh apple > $@ || (rm -f $@; exit 1)
+
+
+apple_mod_CFLAGS = $(COMMON_CFLAGS)
+apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For pc.mod
+pc_mod_SOURCES = partmap/pc.c
+CLEANFILES += pc.mod mod-pc.o mod-pc.c pre-pc.o pc_mod-partmap_pc.o def-pc.lst und-pc.lst
+MOSTLYCLEANFILES += pc_mod-partmap_pc.d
+DEFSYMFILES += def-pc.lst
+UNDSYMFILES += und-pc.lst
+
+pc.mod: pre-pc.o mod-pc.o
+	-rm -f $@
+	$(LD) $(pc_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-pc.o: pc_mod-partmap_pc.o
+	-rm -f $@
+	$(LD) $(pc_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-pc.o: mod-pc.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -c -o $@ $<
+
+mod-pc.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'pc' $< > $@ || (rm -f $@; exit 1)
+
+def-pc.lst: pre-pc.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 pc/' > $@
+
+und-pc.lst: pre-pc.o
+	echo 'pc' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+pc_mod-partmap_pc.o: partmap/pc.c
+	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -c -o $@ $<
+
+pc_mod-partmap_pc.d: partmap/pc.c
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -M $< 	  | sed 's,pc\.o[ :]*,pc_mod-partmap_pc.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include pc_mod-partmap_pc.d
+
+CLEANFILES += cmd-pc_mod-partmap_pc.lst fs-pc_mod-partmap_pc.lst
+COMMANDFILES += cmd-pc_mod-partmap_pc.lst
+FSFILES += fs-pc_mod-partmap_pc.lst
+
+cmd-pc_mod-partmap_pc.lst: partmap/pc.c gencmdlist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh pc > $@ || (rm -f $@; exit 1)
+
+fs-pc_mod-partmap_pc.lst: partmap/pc.c genfslist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh pc > $@ || (rm -f $@; exit 1)
+
+
+pc_mod_CFLAGS = $(COMMON_CFLAGS)
+pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sun.mod
+sun_mod_SOURCES = partmap/sun.c
+CLEANFILES += sun.mod mod-sun.o mod-sun.c pre-sun.o sun_mod-partmap_sun.o def-sun.lst und-sun.lst
+MOSTLYCLEANFILES += sun_mod-partmap_sun.d
+DEFSYMFILES += def-sun.lst
+UNDSYMFILES += und-sun.lst
+
+sun.mod: pre-sun.o mod-sun.o
+	-rm -f $@
+	$(LD) $(sun_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-sun.o: sun_mod-partmap_sun.o
+	-rm -f $@
+	$(LD) $(sun_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-sun.o: mod-sun.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -c -o $@ $<
+
+mod-sun.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'sun' $< > $@ || (rm -f $@; exit 1)
+
+def-sun.lst: pre-sun.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 sun/' > $@
+
+und-sun.lst: pre-sun.o
+	echo 'sun' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+sun_mod-partmap_sun.o: partmap/sun.c
+	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -c -o $@ $<
+
+sun_mod-partmap_sun.d: partmap/sun.c
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -M $< 	  | sed 's,sun\.o[ :]*,sun_mod-partmap_sun.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include sun_mod-partmap_sun.d
+
+CLEANFILES += cmd-sun_mod-partmap_sun.lst fs-sun_mod-partmap_sun.lst
+COMMANDFILES += cmd-sun_mod-partmap_sun.lst
+FSFILES += fs-sun_mod-partmap_sun.lst
+
+cmd-sun_mod-partmap_sun.lst: partmap/sun.c gencmdlist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh sun > $@ || (rm -f $@; exit 1)
+
+fs-sun_mod-partmap_sun.lst: partmap/sun.c genfslist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh sun > $@ || (rm -f $@; exit 1)
+
+
+sun_mod_CFLAGS = $(COMMON_CFLAGS)
+sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For acorn.mod
+acorn_mod_SOURCES = partmap/acorn.c
+CLEANFILES += acorn.mod mod-acorn.o mod-acorn.c pre-acorn.o acorn_mod-partmap_acorn.o def-acorn.lst und-acorn.lst
+MOSTLYCLEANFILES += acorn_mod-partmap_acorn.d
+DEFSYMFILES += def-acorn.lst
+UNDSYMFILES += und-acorn.lst
+
+acorn.mod: pre-acorn.o mod-acorn.o
+	-rm -f $@
+	$(LD) $(acorn_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-acorn.o: acorn_mod-partmap_acorn.o
+	-rm -f $@
+	$(LD) $(acorn_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-acorn.o: mod-acorn.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -c -o $@ $<
+
+mod-acorn.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'acorn' $< > $@ || (rm -f $@; exit 1)
+
+def-acorn.lst: pre-acorn.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 acorn/' > $@
+
+und-acorn.lst: pre-acorn.o
+	echo 'acorn' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+acorn_mod-partmap_acorn.o: partmap/acorn.c
+	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -c -o $@ $<
+
+acorn_mod-partmap_acorn.d: partmap/acorn.c
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -M $< 	  | sed 's,acorn\.o[ :]*,acorn_mod-partmap_acorn.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include acorn_mod-partmap_acorn.d
+
+CLEANFILES += cmd-acorn_mod-partmap_acorn.lst fs-acorn_mod-partmap_acorn.lst
+COMMANDFILES += cmd-acorn_mod-partmap_acorn.lst
+FSFILES += fs-acorn_mod-partmap_acorn.lst
+
+cmd-acorn_mod-partmap_acorn.lst: partmap/acorn.c gencmdlist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh acorn > $@ || (rm -f $@; exit 1)
+
+fs-acorn_mod-partmap_acorn.lst: partmap/acorn.c genfslist.sh
+	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh acorn > $@ || (rm -f $@; exit 1)
+
+
+acorn_mod_CFLAGS = $(COMMON_CFLAGS)
+acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Commands.
+pkgdata_MODULES += hello.mod boot.mod terminal.mod ls.mod	\
+	cmp.mod cat.mod help.mod font.mod search.mod		\
+	loopback.mod default.mod timeout.mod configfile.mod	\
+	terminfo.mod
+
+# For hello.mod.
+hello_mod_SOURCES = hello/hello.c
+CLEANFILES += hello.mod mod-hello.o mod-hello.c pre-hello.o hello_mod-hello_hello.o def-hello.lst und-hello.lst
+MOSTLYCLEANFILES += hello_mod-hello_hello.d
+DEFSYMFILES += def-hello.lst
+UNDSYMFILES += und-hello.lst
+
+hello.mod: pre-hello.o mod-hello.o
+	-rm -f $@
+	$(LD) $(hello_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-hello.o: hello_mod-hello_hello.o
+	-rm -f $@
+	$(LD) $(hello_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-hello.o: mod-hello.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -c -o $@ $<
+
+mod-hello.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'hello' $< > $@ || (rm -f $@; exit 1)
+
+def-hello.lst: pre-hello.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 hello/' > $@
+
+und-hello.lst: pre-hello.o
+	echo 'hello' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+hello_mod-hello_hello.o: hello/hello.c
+	$(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -c -o $@ $<
+
+hello_mod-hello_hello.d: hello/hello.c
+	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -M $< 	  | sed 's,hello\.o[ :]*,hello_mod-hello_hello.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include hello_mod-hello_hello.d
+
+CLEANFILES += cmd-hello_mod-hello_hello.lst fs-hello_mod-hello_hello.lst
+COMMANDFILES += cmd-hello_mod-hello_hello.lst
+FSFILES += fs-hello_mod-hello_hello.lst
+
+cmd-hello_mod-hello_hello.lst: hello/hello.c gencmdlist.sh
+	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh hello > $@ || (rm -f $@; exit 1)
+
+fs-hello_mod-hello_hello.lst: hello/hello.c genfslist.sh
+	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh hello > $@ || (rm -f $@; exit 1)
+
+
+hello_mod_CFLAGS = $(COMMON_CFLAGS)
+hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For boot.mod.
+boot_mod_SOURCES = commands/boot.c
+CLEANFILES += boot.mod mod-boot.o mod-boot.c pre-boot.o boot_mod-commands_boot.o def-boot.lst und-boot.lst
+MOSTLYCLEANFILES += boot_mod-commands_boot.d
+DEFSYMFILES += def-boot.lst
+UNDSYMFILES += und-boot.lst
+
+boot.mod: pre-boot.o mod-boot.o
+	-rm -f $@
+	$(LD) $(boot_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-boot.o: boot_mod-commands_boot.o
+	-rm -f $@
+	$(LD) $(boot_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-boot.o: mod-boot.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -c -o $@ $<
+
+mod-boot.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'boot' $< > $@ || (rm -f $@; exit 1)
+
+def-boot.lst: pre-boot.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 boot/' > $@
+
+und-boot.lst: pre-boot.o
+	echo 'boot' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+boot_mod-commands_boot.o: commands/boot.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -c -o $@ $<
+
+boot_mod-commands_boot.d: commands/boot.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -M $< 	  | sed 's,boot\.o[ :]*,boot_mod-commands_boot.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include boot_mod-commands_boot.d
+
+CLEANFILES += cmd-boot_mod-commands_boot.lst fs-boot_mod-commands_boot.lst
+COMMANDFILES += cmd-boot_mod-commands_boot.lst
+FSFILES += fs-boot_mod-commands_boot.lst
+
+cmd-boot_mod-commands_boot.lst: commands/boot.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh boot > $@ || (rm -f $@; exit 1)
+
+fs-boot_mod-commands_boot.lst: commands/boot.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh boot > $@ || (rm -f $@; exit 1)
+
+
+boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminal.mod.
+terminal_mod_SOURCES = commands/terminal.c
+CLEANFILES += terminal.mod mod-terminal.o mod-terminal.c pre-terminal.o terminal_mod-commands_terminal.o def-terminal.lst und-terminal.lst
+MOSTLYCLEANFILES += terminal_mod-commands_terminal.d
+DEFSYMFILES += def-terminal.lst
+UNDSYMFILES += und-terminal.lst
+
+terminal.mod: pre-terminal.o mod-terminal.o
+	-rm -f $@
+	$(LD) $(terminal_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-terminal.o: terminal_mod-commands_terminal.o
+	-rm -f $@
+	$(LD) $(terminal_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-terminal.o: mod-terminal.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -c -o $@ $<
+
+mod-terminal.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'terminal' $< > $@ || (rm -f $@; exit 1)
+
+def-terminal.lst: pre-terminal.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 terminal/' > $@
+
+und-terminal.lst: pre-terminal.o
+	echo 'terminal' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+terminal_mod-commands_terminal.o: commands/terminal.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -c -o $@ $<
+
+terminal_mod-commands_terminal.d: commands/terminal.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -M $< 	  | sed 's,terminal\.o[ :]*,terminal_mod-commands_terminal.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include terminal_mod-commands_terminal.d
+
+CLEANFILES += cmd-terminal_mod-commands_terminal.lst fs-terminal_mod-commands_terminal.lst
+COMMANDFILES += cmd-terminal_mod-commands_terminal.lst
+FSFILES += fs-terminal_mod-commands_terminal.lst
+
+cmd-terminal_mod-commands_terminal.lst: commands/terminal.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh terminal > $@ || (rm -f $@; exit 1)
+
+fs-terminal_mod-commands_terminal.lst: commands/terminal.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh terminal > $@ || (rm -f $@; exit 1)
+
+
+terminal_mod_CFLAGS = $(COMMON_CFLAGS)
+terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ls.mod.
+ls_mod_SOURCES = commands/ls.c
+CLEANFILES += ls.mod mod-ls.o mod-ls.c pre-ls.o ls_mod-commands_ls.o def-ls.lst und-ls.lst
+MOSTLYCLEANFILES += ls_mod-commands_ls.d
+DEFSYMFILES += def-ls.lst
+UNDSYMFILES += und-ls.lst
+
+ls.mod: pre-ls.o mod-ls.o
+	-rm -f $@
+	$(LD) $(ls_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-ls.o: ls_mod-commands_ls.o
+	-rm -f $@
+	$(LD) $(ls_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-ls.o: mod-ls.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -c -o $@ $<
+
+mod-ls.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'ls' $< > $@ || (rm -f $@; exit 1)
+
+def-ls.lst: pre-ls.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 ls/' > $@
+
+und-ls.lst: pre-ls.o
+	echo 'ls' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+ls_mod-commands_ls.o: commands/ls.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -c -o $@ $<
+
+ls_mod-commands_ls.d: commands/ls.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -M $< 	  | sed 's,ls\.o[ :]*,ls_mod-commands_ls.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include ls_mod-commands_ls.d
+
+CLEANFILES += cmd-ls_mod-commands_ls.lst fs-ls_mod-commands_ls.lst
+COMMANDFILES += cmd-ls_mod-commands_ls.lst
+FSFILES += fs-ls_mod-commands_ls.lst
+
+cmd-ls_mod-commands_ls.lst: commands/ls.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ls > $@ || (rm -f $@; exit 1)
+
+fs-ls_mod-commands_ls.lst: commands/ls.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ls > $@ || (rm -f $@; exit 1)
+
+
+ls_mod_CFLAGS = $(COMMON_CFLAGS)
+ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cmp.mod.
+cmp_mod_SOURCES = commands/cmp.c
+CLEANFILES += cmp.mod mod-cmp.o mod-cmp.c pre-cmp.o cmp_mod-commands_cmp.o def-cmp.lst und-cmp.lst
+MOSTLYCLEANFILES += cmp_mod-commands_cmp.d
+DEFSYMFILES += def-cmp.lst
+UNDSYMFILES += und-cmp.lst
+
+cmp.mod: pre-cmp.o mod-cmp.o
+	-rm -f $@
+	$(LD) $(cmp_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-cmp.o: cmp_mod-commands_cmp.o
+	-rm -f $@
+	$(LD) $(cmp_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-cmp.o: mod-cmp.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -c -o $@ $<
+
+mod-cmp.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'cmp' $< > $@ || (rm -f $@; exit 1)
+
+def-cmp.lst: pre-cmp.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cmp/' > $@
+
+und-cmp.lst: pre-cmp.o
+	echo 'cmp' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+cmp_mod-commands_cmp.o: commands/cmp.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -c -o $@ $<
+
+cmp_mod-commands_cmp.d: commands/cmp.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -M $< 	  | sed 's,cmp\.o[ :]*,cmp_mod-commands_cmp.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include cmp_mod-commands_cmp.d
+
+CLEANFILES += cmd-cmp_mod-commands_cmp.lst fs-cmp_mod-commands_cmp.lst
+COMMANDFILES += cmd-cmp_mod-commands_cmp.lst
+FSFILES += fs-cmp_mod-commands_cmp.lst
+
+cmd-cmp_mod-commands_cmp.lst: commands/cmp.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh cmp > $@ || (rm -f $@; exit 1)
+
+fs-cmp_mod-commands_cmp.lst: commands/cmp.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh cmp > $@ || (rm -f $@; exit 1)
+
+
+cmp_mod_CFLAGS = $(COMMON_CFLAGS)
+cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cat.mod.
+cat_mod_SOURCES = commands/cat.c
+CLEANFILES += cat.mod mod-cat.o mod-cat.c pre-cat.o cat_mod-commands_cat.o def-cat.lst und-cat.lst
+MOSTLYCLEANFILES += cat_mod-commands_cat.d
+DEFSYMFILES += def-cat.lst
+UNDSYMFILES += und-cat.lst
+
+cat.mod: pre-cat.o mod-cat.o
+	-rm -f $@
+	$(LD) $(cat_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-cat.o: cat_mod-commands_cat.o
+	-rm -f $@
+	$(LD) $(cat_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-cat.o: mod-cat.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -c -o $@ $<
+
+mod-cat.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'cat' $< > $@ || (rm -f $@; exit 1)
+
+def-cat.lst: pre-cat.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cat/' > $@
+
+und-cat.lst: pre-cat.o
+	echo 'cat' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+cat_mod-commands_cat.o: commands/cat.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -c -o $@ $<
+
+cat_mod-commands_cat.d: commands/cat.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -M $< 	  | sed 's,cat\.o[ :]*,cat_mod-commands_cat.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include cat_mod-commands_cat.d
+
+CLEANFILES += cmd-cat_mod-commands_cat.lst fs-cat_mod-commands_cat.lst
+COMMANDFILES += cmd-cat_mod-commands_cat.lst
+FSFILES += fs-cat_mod-commands_cat.lst
+
+cmd-cat_mod-commands_cat.lst: commands/cat.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh cat > $@ || (rm -f $@; exit 1)
+
+fs-cat_mod-commands_cat.lst: commands/cat.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh cat > $@ || (rm -f $@; exit 1)
+
+
+cat_mod_CFLAGS = $(COMMON_CFLAGS)
+cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For help.mod.
+help_mod_SOURCES = commands/help.c
+CLEANFILES += help.mod mod-help.o mod-help.c pre-help.o help_mod-commands_help.o def-help.lst und-help.lst
+MOSTLYCLEANFILES += help_mod-commands_help.d
+DEFSYMFILES += def-help.lst
+UNDSYMFILES += und-help.lst
+
+help.mod: pre-help.o mod-help.o
+	-rm -f $@
+	$(LD) $(help_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-help.o: help_mod-commands_help.o
+	-rm -f $@
+	$(LD) $(help_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-help.o: mod-help.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -c -o $@ $<
+
+mod-help.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'help' $< > $@ || (rm -f $@; exit 1)
+
+def-help.lst: pre-help.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 help/' > $@
+
+und-help.lst: pre-help.o
+	echo 'help' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+help_mod-commands_help.o: commands/help.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -c -o $@ $<
+
+help_mod-commands_help.d: commands/help.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -M $< 	  | sed 's,help\.o[ :]*,help_mod-commands_help.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include help_mod-commands_help.d
+
+CLEANFILES += cmd-help_mod-commands_help.lst fs-help_mod-commands_help.lst
+COMMANDFILES += cmd-help_mod-commands_help.lst
+FSFILES += fs-help_mod-commands_help.lst
+
+cmd-help_mod-commands_help.lst: commands/help.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh help > $@ || (rm -f $@; exit 1)
+
+fs-help_mod-commands_help.lst: commands/help.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh help > $@ || (rm -f $@; exit 1)
+
+
+help_mod_CFLAGS = $(COMMON_CFLAGS)
+help_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For font.mod.
+font_mod_SOURCES = font/manager.c
+CLEANFILES += font.mod mod-font.o mod-font.c pre-font.o font_mod-font_manager.o def-font.lst und-font.lst
+MOSTLYCLEANFILES += font_mod-font_manager.d
+DEFSYMFILES += def-font.lst
+UNDSYMFILES += und-font.lst
+
+font.mod: pre-font.o mod-font.o
+	-rm -f $@
+	$(LD) $(font_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-font.o: font_mod-font_manager.o
+	-rm -f $@
+	$(LD) $(font_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-font.o: mod-font.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -c -o $@ $<
+
+mod-font.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'font' $< > $@ || (rm -f $@; exit 1)
+
+def-font.lst: pre-font.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 font/' > $@
+
+und-font.lst: pre-font.o
+	echo 'font' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+font_mod-font_manager.o: font/manager.c
+	$(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -c -o $@ $<
+
+font_mod-font_manager.d: font/manager.c
+	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -M $< 	  | sed 's,manager\.o[ :]*,font_mod-font_manager.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include font_mod-font_manager.d
+
+CLEANFILES += cmd-font_mod-font_manager.lst fs-font_mod-font_manager.lst
+COMMANDFILES += cmd-font_mod-font_manager.lst
+FSFILES += fs-font_mod-font_manager.lst
+
+cmd-font_mod-font_manager.lst: font/manager.c gencmdlist.sh
+	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh font > $@ || (rm -f $@; exit 1)
+
+fs-font_mod-font_manager.lst: font/manager.c genfslist.sh
+	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh font > $@ || (rm -f $@; exit 1)
+
+
+font_mod_CFLAGS = $(COMMON_CFLAGS)
+font_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For search.mod.
+search_mod_SOURCES = commands/search.c
+CLEANFILES += search.mod mod-search.o mod-search.c pre-search.o search_mod-commands_search.o def-search.lst und-search.lst
+MOSTLYCLEANFILES += search_mod-commands_search.d
+DEFSYMFILES += def-search.lst
+UNDSYMFILES += und-search.lst
+
+search.mod: pre-search.o mod-search.o
+	-rm -f $@
+	$(LD) $(search_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-search.o: search_mod-commands_search.o
+	-rm -f $@
+	$(LD) $(search_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-search.o: mod-search.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -c -o $@ $<
+
+mod-search.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'search' $< > $@ || (rm -f $@; exit 1)
+
+def-search.lst: pre-search.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 search/' > $@
+
+und-search.lst: pre-search.o
+	echo 'search' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+search_mod-commands_search.o: commands/search.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -c -o $@ $<
+
+search_mod-commands_search.d: commands/search.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -M $< 	  | sed 's,search\.o[ :]*,search_mod-commands_search.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include search_mod-commands_search.d
+
+CLEANFILES += cmd-search_mod-commands_search.lst fs-search_mod-commands_search.lst
+COMMANDFILES += cmd-search_mod-commands_search.lst
+FSFILES += fs-search_mod-commands_search.lst
+
+cmd-search_mod-commands_search.lst: commands/search.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh search > $@ || (rm -f $@; exit 1)
+
+fs-search_mod-commands_search.lst: commands/search.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh search > $@ || (rm -f $@; exit 1)
+
+
+search_mod_CFLAGS = $(COMMON_CFLAGS)
+search_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For test.mod.
+test_mod_SOURCES = commands/test.c
+test_mod_CFLAGS = $(COMMON_CFLAGS)
+test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For loopback.mod
+loopback_mod_SOURCES = disk/loopback.c
+CLEANFILES += loopback.mod mod-loopback.o mod-loopback.c pre-loopback.o loopback_mod-disk_loopback.o def-loopback.lst und-loopback.lst
+MOSTLYCLEANFILES += loopback_mod-disk_loopback.d
+DEFSYMFILES += def-loopback.lst
+UNDSYMFILES += und-loopback.lst
+
+loopback.mod: pre-loopback.o mod-loopback.o
+	-rm -f $@
+	$(LD) $(loopback_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-loopback.o: loopback_mod-disk_loopback.o
+	-rm -f $@
+	$(LD) $(loopback_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-loopback.o: mod-loopback.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -c -o $@ $<
+
+mod-loopback.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'loopback' $< > $@ || (rm -f $@; exit 1)
+
+def-loopback.lst: pre-loopback.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 loopback/' > $@
+
+und-loopback.lst: pre-loopback.o
+	echo 'loopback' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+loopback_mod-disk_loopback.o: disk/loopback.c
+	$(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -c -o $@ $<
+
+loopback_mod-disk_loopback.d: disk/loopback.c
+	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -M $< 	  | sed 's,loopback\.o[ :]*,loopback_mod-disk_loopback.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include loopback_mod-disk_loopback.d
+
+CLEANFILES += cmd-loopback_mod-disk_loopback.lst fs-loopback_mod-disk_loopback.lst
+COMMANDFILES += cmd-loopback_mod-disk_loopback.lst
+FSFILES += fs-loopback_mod-disk_loopback.lst
+
+cmd-loopback_mod-disk_loopback.lst: disk/loopback.c gencmdlist.sh
+	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh loopback > $@ || (rm -f $@; exit 1)
+
+fs-loopback_mod-disk_loopback.lst: disk/loopback.c genfslist.sh
+	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh loopback > $@ || (rm -f $@; exit 1)
+
+
+loopback_mod_CFLAGS = $(COMMON_CFLAGS)
+loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For default.mod
+default_mod_SOURCES = commands/default.c
+CLEANFILES += default.mod mod-default.o mod-default.c pre-default.o default_mod-commands_default.o def-default.lst und-default.lst
+MOSTLYCLEANFILES += default_mod-commands_default.d
+DEFSYMFILES += def-default.lst
+UNDSYMFILES += und-default.lst
+
+default.mod: pre-default.o mod-default.o
+	-rm -f $@
+	$(LD) $(default_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-default.o: default_mod-commands_default.o
+	-rm -f $@
+	$(LD) $(default_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-default.o: mod-default.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -c -o $@ $<
+
+mod-default.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'default' $< > $@ || (rm -f $@; exit 1)
+
+def-default.lst: pre-default.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 default/' > $@
+
+und-default.lst: pre-default.o
+	echo 'default' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+default_mod-commands_default.o: commands/default.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -c -o $@ $<
+
+default_mod-commands_default.d: commands/default.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -M $< 	  | sed 's,default\.o[ :]*,default_mod-commands_default.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include default_mod-commands_default.d
+
+CLEANFILES += cmd-default_mod-commands_default.lst fs-default_mod-commands_default.lst
+COMMANDFILES += cmd-default_mod-commands_default.lst
+FSFILES += fs-default_mod-commands_default.lst
+
+cmd-default_mod-commands_default.lst: commands/default.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh default > $@ || (rm -f $@; exit 1)
+
+fs-default_mod-commands_default.lst: commands/default.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh default > $@ || (rm -f $@; exit 1)
+
+
+default_mod_CFLAGS = $(COMMON_CFLAGS)
+default_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For timeout.mod
+timeout_mod_SOURCES = commands/timeout.c
+CLEANFILES += timeout.mod mod-timeout.o mod-timeout.c pre-timeout.o timeout_mod-commands_timeout.o def-timeout.lst und-timeout.lst
+MOSTLYCLEANFILES += timeout_mod-commands_timeout.d
+DEFSYMFILES += def-timeout.lst
+UNDSYMFILES += und-timeout.lst
+
+timeout.mod: pre-timeout.o mod-timeout.o
+	-rm -f $@
+	$(LD) $(timeout_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-timeout.o: timeout_mod-commands_timeout.o
+	-rm -f $@
+	$(LD) $(timeout_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-timeout.o: mod-timeout.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -c -o $@ $<
+
+mod-timeout.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'timeout' $< > $@ || (rm -f $@; exit 1)
+
+def-timeout.lst: pre-timeout.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 timeout/' > $@
+
+und-timeout.lst: pre-timeout.o
+	echo 'timeout' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+timeout_mod-commands_timeout.o: commands/timeout.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -c -o $@ $<
+
+timeout_mod-commands_timeout.d: commands/timeout.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -M $< 	  | sed 's,timeout\.o[ :]*,timeout_mod-commands_timeout.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include timeout_mod-commands_timeout.d
+
+CLEANFILES += cmd-timeout_mod-commands_timeout.lst fs-timeout_mod-commands_timeout.lst
+COMMANDFILES += cmd-timeout_mod-commands_timeout.lst
+FSFILES += fs-timeout_mod-commands_timeout.lst
+
+cmd-timeout_mod-commands_timeout.lst: commands/timeout.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh timeout > $@ || (rm -f $@; exit 1)
+
+fs-timeout_mod-commands_timeout.lst: commands/timeout.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh timeout > $@ || (rm -f $@; exit 1)
+
+
+timeout_mod_CFLAGS = $(COMMON_CFLAGS)
+timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For configfile.mod
+configfile_mod_SOURCES = commands/configfile.c
+CLEANFILES += configfile.mod mod-configfile.o mod-configfile.c pre-configfile.o configfile_mod-commands_configfile.o def-configfile.lst und-configfile.lst
+MOSTLYCLEANFILES += configfile_mod-commands_configfile.d
+DEFSYMFILES += def-configfile.lst
+UNDSYMFILES += und-configfile.lst
+
+configfile.mod: pre-configfile.o mod-configfile.o
+	-rm -f $@
+	$(LD) $(configfile_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-configfile.o: configfile_mod-commands_configfile.o
+	-rm -f $@
+	$(LD) $(configfile_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-configfile.o: mod-configfile.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -c -o $@ $<
+
+mod-configfile.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'configfile' $< > $@ || (rm -f $@; exit 1)
+
+def-configfile.lst: pre-configfile.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 configfile/' > $@
+
+und-configfile.lst: pre-configfile.o
+	echo 'configfile' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+configfile_mod-commands_configfile.o: commands/configfile.c
+	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -c -o $@ $<
+
+configfile_mod-commands_configfile.d: commands/configfile.c
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -M $< 	  | sed 's,configfile\.o[ :]*,configfile_mod-commands_configfile.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include configfile_mod-commands_configfile.d
+
+CLEANFILES += cmd-configfile_mod-commands_configfile.lst fs-configfile_mod-commands_configfile.lst
+COMMANDFILES += cmd-configfile_mod-commands_configfile.lst
+FSFILES += fs-configfile_mod-commands_configfile.lst
+
+cmd-configfile_mod-commands_configfile.lst: commands/configfile.c gencmdlist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh configfile > $@ || (rm -f $@; exit 1)
+
+fs-configfile_mod-commands_configfile.lst: commands/configfile.c genfslist.sh
+	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh configfile > $@ || (rm -f $@; exit 1)
+
+
+configfile_mod_CFLAGS = $(COMMON_CFLAGS)
+configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminfo.mod.
+terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
+CLEANFILES += terminfo.mod mod-terminfo.o mod-terminfo.c pre-terminfo.o terminfo_mod-term_terminfo.o terminfo_mod-term_tparm.o def-terminfo.lst und-terminfo.lst
+MOSTLYCLEANFILES += terminfo_mod-term_terminfo.d terminfo_mod-term_tparm.d
+DEFSYMFILES += def-terminfo.lst
+UNDSYMFILES += und-terminfo.lst
+
+terminfo.mod: pre-terminfo.o mod-terminfo.o
+	-rm -f $@
+	$(LD) $(terminfo_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
+	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-terminfo.o: terminfo_mod-term_terminfo.o terminfo_mod-term_tparm.o
+	-rm -f $@
+	$(LD) $(terminfo_mod_LDFLAGS) -r -d -o $@ $^
+
+mod-terminfo.o: mod-terminfo.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -c -o $@ $<
+
+mod-terminfo.c: moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh 'terminfo' $< > $@ || (rm -f $@; exit 1)
+
+def-terminfo.lst: pre-terminfo.o
+	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 terminfo/' > $@
+
+und-terminfo.lst: pre-terminfo.o
+	echo 'terminfo' > $@
+	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+terminfo_mod-term_terminfo.o: term/terminfo.c
+	$(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -c -o $@ $<
+
+terminfo_mod-term_terminfo.d: term/terminfo.c
+	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -M $< 	  | sed 's,terminfo\.o[ :]*,terminfo_mod-term_terminfo.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include terminfo_mod-term_terminfo.d
+
+CLEANFILES += cmd-terminfo_mod-term_terminfo.lst fs-terminfo_mod-term_terminfo.lst
+COMMANDFILES += cmd-terminfo_mod-term_terminfo.lst
+FSFILES += fs-terminfo_mod-term_terminfo.lst
+
+cmd-terminfo_mod-term_terminfo.lst: term/terminfo.c gencmdlist.sh
+	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh terminfo > $@ || (rm -f $@; exit 1)
+
+fs-terminfo_mod-term_terminfo.lst: term/terminfo.c genfslist.sh
+	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh terminfo > $@ || (rm -f $@; exit 1)
+
+
+terminfo_mod-term_tparm.o: term/tparm.c
+	$(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -c -o $@ $<
+
+terminfo_mod-term_tparm.d: term/tparm.c
+	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -M $< 	  | sed 's,tparm\.o[ :]*,terminfo_mod-term_tparm.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
+
+-include terminfo_mod-term_tparm.d
+
+CLEANFILES += cmd-terminfo_mod-term_tparm.lst fs-terminfo_mod-term_tparm.lst
+COMMANDFILES += cmd-terminfo_mod-term_tparm.lst
+FSFILES += fs-terminfo_mod-term_tparm.lst
+
+cmd-terminfo_mod-term_tparm.lst: term/tparm.c gencmdlist.sh
+	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh terminfo > $@ || (rm -f $@; exit 1)
+
+fs-terminfo_mod-term_tparm.lst: term/tparm.c genfslist.sh
+	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh terminfo > $@ || (rm -f $@; exit 1)
+
+
+terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
+terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Misc.
+pkgdata_MODULES += gzio.mod 
+
+# 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) $(gzio_mod_LDFLAGS) $(LDFLAGS) -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) $(gzio_mod_LDFLAGS) -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_mod-io_gzio.lst fs-gzio_mod-io_gzio.lst
+COMMANDFILES += cmd-gzio_mod-io_gzio.lst
+FSFILES += fs-gzio_mod-io_gzio.lst
+
+cmd-gzio_mod-io_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_mod-io_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)
+gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+
diff --git a/conf/common.rmk b/conf/common.rmk
new file mode 100644
index 000000000..8df4af205
--- /dev/null
+++ b/conf/common.rmk
@@ -0,0 +1,200 @@
+# -*- makefile -*-
+
+# For the parser.
+grub_script.tab.c grub_script.tab.h: normal/parser.y
+	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
+
+# For grub-emu.
+grub_modules_init.lst: geninit.sh
+	(cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
+
+grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
+	sh $(srcdir)/geninitheader.sh > $@
+
+grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
+	sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
+
+
+
+# Filing systems.
+pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod		\
+	minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod affs.mod	\
+	sfs.mod
+
+# For fshelp.mod.
+fshelp_mod_SOURCES = fs/fshelp.c
+fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
+fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For fat.mod.
+fat_mod_SOURCES = fs/fat.c
+fat_mod_CFLAGS = $(COMMON_CFLAGS)
+fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ufs.mod.
+ufs_mod_SOURCES = fs/ufs.c
+ufs_mod_CFLAGS = $(COMMON_CFLAGS)
+ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ext2.mod.
+ext2_mod_SOURCES = fs/ext2.c
+ext2_mod_CFLAGS = $(COMMON_CFLAGS)
+ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For minix.mod.
+minix_mod_SOURCES = fs/minix.c
+minix_mod_CFLAGS = $(COMMON_CFLAGS)
+minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For hfs.mod.
+hfs_mod_SOURCES = fs/hfs.c
+hfs_mod_CFLAGS = $(COMMON_CFLAGS)
+hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For jfs.mod.
+jfs_mod_SOURCES = fs/jfs.c
+jfs_mod_CFLAGS = $(COMMON_CFLAGS)
+jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For iso9660.mod.
+iso9660_mod_SOURCES = fs/iso9660.c
+iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
+iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For xfs.mod.
+xfs_mod_SOURCES = fs/xfs.c
+xfs_mod_CFLAGS = $(COMMON_CFLAGS)
+xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For affs.mod.
+affs_mod_SOURCES = fs/affs.c
+affs_mod_CFLAGS = $(COMMON_CFLAGS)
+affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sfs.mod.
+sfs_mod_SOURCES = fs/sfs.c
+sfs_mod_CFLAGS = $(COMMON_CFLAGS)
+sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+
+# Partiton maps.
+pkgdata_MODULES += amiga.mod apple.mod pc.mod sun.mod acorn.mod
+
+# For amiga.mod
+amiga_mod_SOURCES = partmap/amiga.c
+amiga_mod_CFLAGS = $(COMMON_CFLAGS)
+amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For apple.mod
+apple_mod_SOURCES = partmap/apple.c
+apple_mod_CFLAGS = $(COMMON_CFLAGS)
+apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For pc.mod
+pc_mod_SOURCES = partmap/pc.c
+pc_mod_CFLAGS = $(COMMON_CFLAGS)
+pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For sun.mod
+sun_mod_SOURCES = partmap/sun.c
+sun_mod_CFLAGS = $(COMMON_CFLAGS)
+sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For acorn.mod
+acorn_mod_SOURCES = partmap/acorn.c
+acorn_mod_CFLAGS = $(COMMON_CFLAGS)
+acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Commands.
+pkgdata_MODULES += hello.mod boot.mod terminal.mod ls.mod	\
+	cmp.mod cat.mod help.mod font.mod search.mod		\
+	loopback.mod default.mod timeout.mod configfile.mod	\
+	terminfo.mod
+
+# For hello.mod.
+hello_mod_SOURCES = hello/hello.c
+hello_mod_CFLAGS = $(COMMON_CFLAGS)
+hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For boot.mod.
+boot_mod_SOURCES = commands/boot.c
+boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminal.mod.
+terminal_mod_SOURCES = commands/terminal.c
+terminal_mod_CFLAGS = $(COMMON_CFLAGS)
+terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ls.mod.
+ls_mod_SOURCES = commands/ls.c
+ls_mod_CFLAGS = $(COMMON_CFLAGS)
+ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cmp.mod.
+cmp_mod_SOURCES = commands/cmp.c
+cmp_mod_CFLAGS = $(COMMON_CFLAGS)
+cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cat.mod.
+cat_mod_SOURCES = commands/cat.c
+cat_mod_CFLAGS = $(COMMON_CFLAGS)
+cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For help.mod.
+help_mod_SOURCES = commands/help.c
+help_mod_CFLAGS = $(COMMON_CFLAGS)
+help_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For font.mod.
+font_mod_SOURCES = font/manager.c
+font_mod_CFLAGS = $(COMMON_CFLAGS)
+font_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For search.mod.
+search_mod_SOURCES = commands/search.c
+search_mod_CFLAGS = $(COMMON_CFLAGS)
+search_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For test.mod.
+test_mod_SOURCES = commands/test.c
+test_mod_CFLAGS = $(COMMON_CFLAGS)
+test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For loopback.mod
+loopback_mod_SOURCES = disk/loopback.c
+loopback_mod_CFLAGS = $(COMMON_CFLAGS)
+loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For default.mod
+default_mod_SOURCES = commands/default.c
+default_mod_CFLAGS = $(COMMON_CFLAGS)
+default_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For timeout.mod
+timeout_mod_SOURCES = commands/timeout.c
+timeout_mod_CFLAGS = $(COMMON_CFLAGS)
+timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For configfile.mod
+configfile_mod_SOURCES = commands/configfile.c
+configfile_mod_CFLAGS = $(COMMON_CFLAGS)
+configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For terminfo.mod.
+terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
+terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
+terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+# Misc.
+pkgdata_MODULES += gzio.mod 
+
+# For gzio.mod.
+gzio_mod_SOURCES = io/gzio.c
+gzio_mod_CFLAGS = $(COMMON_CFLAGS)
+gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
+
diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk
index 16ce4c91b..cb3f58491 100644
--- a/conf/i386-pc.mk
+++ b/conf/i386-pc.mk
@@ -274,11 +274,6 @@ DEFSYMFILES += kernel_syms.lst
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
 	sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
 
-# For the parser.
-grub_script.tab.c grub_script.tab.h: normal/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-
-
 kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) genkernsyms.sh
 	sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
 
@@ -1309,15 +1304,6 @@ grub_emu-grub_emu_init.d: grub_emu_init.c
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-grub_modules_init.lst: geninit.sh
-	(cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
-
-grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
-	sh $(srcdir)/geninitheader.sh > $@
-
-grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
-	sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
-
 # For genmoddep.
 genmoddep_SOURCES = util/genmoddep.c
 CLEANFILES += genmoddep genmoddep-util_genmoddep.o
@@ -1348,15 +1334,9 @@ grub-install: util/i386/pc/grub-install.in config.status
 
 
 # Modules.
-pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod	\
-	ext2.mod minix.mod hfs.mod jfs.mod normal.mod hello.mod vga.mod	\
-	font.mod _multiboot.mod ls.mod boot.mod cmp.mod cat.mod		\
-	terminal.mod fshelp.mod chain.mod multiboot.mod amiga.mod	\
-	apple.mod pc.mod sun.mod loopback.mod reboot.mod halt.mod	\
-	help.mod default.mod timeout.mod configfile.mod vbe.mod		\
-	vesafb.mod vbetest.mod vbeinfo.mod search.mod gzio.mod		\
-	terminfo.mod serial.mod xfs.mod affs.mod sfs.mod test.mod	\
-	acorn.mod
+pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod vga.mod	\
+	_multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod	\
+	vbe.mod vesafb.mod vbetest.mod vbeinfo.mod
 
 # For _chain.mod.
 _chain_mod_SOURCES = loader/i386/pc/chainloader.c
@@ -1395,14 +1375,14 @@ _chain_mod-loader_i386_pc_chainloader.d: loader/i386/pc/chainloader.c
 
 -include _chain_mod-loader_i386_pc_chainloader.d
 
-CLEANFILES += cmd-chainloader.lst fs-chainloader.lst
-COMMANDFILES += cmd-chainloader.lst
-FSFILES += fs-chainloader.lst
+CLEANFILES += cmd-_chain_mod-loader_i386_pc_chainloader.lst fs-_chain_mod-loader_i386_pc_chainloader.lst
+COMMANDFILES += cmd-_chain_mod-loader_i386_pc_chainloader.lst
+FSFILES += fs-_chain_mod-loader_i386_pc_chainloader.lst
 
-cmd-chainloader.lst: loader/i386/pc/chainloader.c gencmdlist.sh
+cmd-_chain_mod-loader_i386_pc_chainloader.lst: loader/i386/pc/chainloader.c gencmdlist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(_chain_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh _chain > $@ || (rm -f $@; exit 1)
 
-fs-chainloader.lst: loader/i386/pc/chainloader.c genfslist.sh
+fs-_chain_mod-loader_i386_pc_chainloader.lst: loader/i386/pc/chainloader.c genfslist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(_chain_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh _chain > $@ || (rm -f $@; exit 1)
 
 
@@ -1446,535 +1426,20 @@ chain_mod-loader_i386_pc_chainloader_normal.d: loader/i386/pc/chainloader_normal
 
 -include chain_mod-loader_i386_pc_chainloader_normal.d
 
-CLEANFILES += cmd-chainloader_normal.lst fs-chainloader_normal.lst
-COMMANDFILES += cmd-chainloader_normal.lst
-FSFILES += fs-chainloader_normal.lst
+CLEANFILES += cmd-chain_mod-loader_i386_pc_chainloader_normal.lst fs-chain_mod-loader_i386_pc_chainloader_normal.lst
+COMMANDFILES += cmd-chain_mod-loader_i386_pc_chainloader_normal.lst
+FSFILES += fs-chain_mod-loader_i386_pc_chainloader_normal.lst
 
-cmd-chainloader_normal.lst: loader/i386/pc/chainloader_normal.c gencmdlist.sh
+cmd-chain_mod-loader_i386_pc_chainloader_normal.lst: loader/i386/pc/chainloader_normal.c gencmdlist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(chain_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh chain > $@ || (rm -f $@; exit 1)
 
-fs-chainloader_normal.lst: loader/i386/pc/chainloader_normal.c genfslist.sh
+fs-chain_mod-loader_i386_pc_chainloader_normal.lst: loader/i386/pc/chainloader_normal.c genfslist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(chain_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh chain > $@ || (rm -f $@; exit 1)
 
 
 chain_mod_CFLAGS = $(COMMON_CFLAGS)
 chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For fshelp.mod.
-fshelp_mod_SOURCES = fs/fshelp.c
-CLEANFILES += fshelp.mod mod-fshelp.o mod-fshelp.c pre-fshelp.o fshelp_mod-fs_fshelp.o def-fshelp.lst und-fshelp.lst
-MOSTLYCLEANFILES += fshelp_mod-fs_fshelp.d
-DEFSYMFILES += def-fshelp.lst
-UNDSYMFILES += und-fshelp.lst
-
-fshelp.mod: pre-fshelp.o mod-fshelp.o
-	-rm -f $@
-	$(LD) $(fshelp_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-fshelp.o: fshelp_mod-fs_fshelp.o
-	-rm -f $@
-	$(LD) $(fshelp_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-fshelp.o: mod-fshelp.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -c -o $@ $<
-
-mod-fshelp.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'fshelp' $< > $@ || (rm -f $@; exit 1)
-
-def-fshelp.lst: pre-fshelp.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 fshelp/' > $@
-
-und-fshelp.lst: pre-fshelp.o
-	echo 'fshelp' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-fshelp_mod-fs_fshelp.o: fs/fshelp.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -c -o $@ $<
-
-fshelp_mod-fs_fshelp.d: fs/fshelp.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -M $< 	  | sed 's,fshelp\.o[ :]*,fshelp_mod-fs_fshelp.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include fshelp_mod-fs_fshelp.d
-
-CLEANFILES += cmd-fshelp.lst fs-fshelp.lst
-COMMANDFILES += cmd-fshelp.lst
-FSFILES += fs-fshelp.lst
-
-cmd-fshelp.lst: fs/fshelp.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh fshelp > $@ || (rm -f $@; exit 1)
-
-fs-fshelp.lst: fs/fshelp.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh fshelp > $@ || (rm -f $@; exit 1)
-
-
-fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
-fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fat.mod.
-fat_mod_SOURCES = fs/fat.c
-CLEANFILES += fat.mod mod-fat.o mod-fat.c pre-fat.o fat_mod-fs_fat.o def-fat.lst und-fat.lst
-MOSTLYCLEANFILES += fat_mod-fs_fat.d
-DEFSYMFILES += def-fat.lst
-UNDSYMFILES += und-fat.lst
-
-fat.mod: pre-fat.o mod-fat.o
-	-rm -f $@
-	$(LD) $(fat_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-fat.o: fat_mod-fs_fat.o
-	-rm -f $@
-	$(LD) $(fat_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-fat.o: mod-fat.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -c -o $@ $<
-
-mod-fat.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'fat' $< > $@ || (rm -f $@; exit 1)
-
-def-fat.lst: pre-fat.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 fat/' > $@
-
-und-fat.lst: pre-fat.o
-	echo 'fat' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-fat_mod-fs_fat.o: fs/fat.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -c -o $@ $<
-
-fat_mod-fs_fat.d: fs/fat.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -M $< 	  | sed 's,fat\.o[ :]*,fat_mod-fs_fat.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include fat_mod-fs_fat.d
-
-CLEANFILES += cmd-fat.lst fs-fat.lst
-COMMANDFILES += cmd-fat.lst
-FSFILES += fs-fat.lst
-
-cmd-fat.lst: fs/fat.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh fat > $@ || (rm -f $@; exit 1)
-
-fs-fat.lst: fs/fat.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh fat > $@ || (rm -f $@; exit 1)
-
-
-fat_mod_CFLAGS = $(COMMON_CFLAGS)
-fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ext2.mod.
-ext2_mod_SOURCES = fs/ext2.c
-CLEANFILES += ext2.mod mod-ext2.o mod-ext2.c pre-ext2.o ext2_mod-fs_ext2.o def-ext2.lst und-ext2.lst
-MOSTLYCLEANFILES += ext2_mod-fs_ext2.d
-DEFSYMFILES += def-ext2.lst
-UNDSYMFILES += und-ext2.lst
-
-ext2.mod: pre-ext2.o mod-ext2.o
-	-rm -f $@
-	$(LD) $(ext2_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-ext2.o: ext2_mod-fs_ext2.o
-	-rm -f $@
-	$(LD) $(ext2_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-ext2.o: mod-ext2.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -c -o $@ $<
-
-mod-ext2.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'ext2' $< > $@ || (rm -f $@; exit 1)
-
-def-ext2.lst: pre-ext2.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 ext2/' > $@
-
-und-ext2.lst: pre-ext2.o
-	echo 'ext2' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-ext2_mod-fs_ext2.o: fs/ext2.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -c -o $@ $<
-
-ext2_mod-fs_ext2.d: fs/ext2.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -M $< 	  | sed 's,ext2\.o[ :]*,ext2_mod-fs_ext2.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include ext2_mod-fs_ext2.d
-
-CLEANFILES += cmd-ext2.lst fs-ext2.lst
-COMMANDFILES += cmd-ext2.lst
-FSFILES += fs-ext2.lst
-
-cmd-ext2.lst: fs/ext2.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ext2 > $@ || (rm -f $@; exit 1)
-
-fs-ext2.lst: fs/ext2.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ext2 > $@ || (rm -f $@; exit 1)
-
-
-ext2_mod_CFLAGS = $(COMMON_CFLAGS)
-ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs.mod.
-ufs_mod_SOURCES = fs/ufs.c
-CLEANFILES += ufs.mod mod-ufs.o mod-ufs.c pre-ufs.o ufs_mod-fs_ufs.o def-ufs.lst und-ufs.lst
-MOSTLYCLEANFILES += ufs_mod-fs_ufs.d
-DEFSYMFILES += def-ufs.lst
-UNDSYMFILES += und-ufs.lst
-
-ufs.mod: pre-ufs.o mod-ufs.o
-	-rm -f $@
-	$(LD) $(ufs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-ufs.o: ufs_mod-fs_ufs.o
-	-rm -f $@
-	$(LD) $(ufs_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-ufs.o: mod-ufs.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -c -o $@ $<
-
-mod-ufs.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'ufs' $< > $@ || (rm -f $@; exit 1)
-
-def-ufs.lst: pre-ufs.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 ufs/' > $@
-
-und-ufs.lst: pre-ufs.o
-	echo 'ufs' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-ufs_mod-fs_ufs.o: fs/ufs.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -c -o $@ $<
-
-ufs_mod-fs_ufs.d: fs/ufs.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -M $< 	  | sed 's,ufs\.o[ :]*,ufs_mod-fs_ufs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include ufs_mod-fs_ufs.d
-
-CLEANFILES += cmd-ufs.lst fs-ufs.lst
-COMMANDFILES += cmd-ufs.lst
-FSFILES += fs-ufs.lst
-
-cmd-ufs.lst: fs/ufs.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ufs > $@ || (rm -f $@; exit 1)
-
-fs-ufs.lst: fs/ufs.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ufs > $@ || (rm -f $@; exit 1)
-
-
-ufs_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minix.mod.
-minix_mod_SOURCES = fs/minix.c
-CLEANFILES += minix.mod mod-minix.o mod-minix.c pre-minix.o minix_mod-fs_minix.o def-minix.lst und-minix.lst
-MOSTLYCLEANFILES += minix_mod-fs_minix.d
-DEFSYMFILES += def-minix.lst
-UNDSYMFILES += und-minix.lst
-
-minix.mod: pre-minix.o mod-minix.o
-	-rm -f $@
-	$(LD) $(minix_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-minix.o: minix_mod-fs_minix.o
-	-rm -f $@
-	$(LD) $(minix_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-minix.o: mod-minix.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -c -o $@ $<
-
-mod-minix.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'minix' $< > $@ || (rm -f $@; exit 1)
-
-def-minix.lst: pre-minix.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 minix/' > $@
-
-und-minix.lst: pre-minix.o
-	echo 'minix' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-minix_mod-fs_minix.o: fs/minix.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -c -o $@ $<
-
-minix_mod-fs_minix.d: fs/minix.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -M $< 	  | sed 's,minix\.o[ :]*,minix_mod-fs_minix.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include minix_mod-fs_minix.d
-
-CLEANFILES += cmd-minix.lst fs-minix.lst
-COMMANDFILES += cmd-minix.lst
-FSFILES += fs-minix.lst
-
-cmd-minix.lst: fs/minix.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh minix > $@ || (rm -f $@; exit 1)
-
-fs-minix.lst: fs/minix.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh minix > $@ || (rm -f $@; exit 1)
-
-
-minix_mod_CFLAGS = $(COMMON_CFLAGS)
-minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfs.mod.
-hfs_mod_SOURCES = fs/hfs.c
-CLEANFILES += hfs.mod mod-hfs.o mod-hfs.c pre-hfs.o hfs_mod-fs_hfs.o def-hfs.lst und-hfs.lst
-MOSTLYCLEANFILES += hfs_mod-fs_hfs.d
-DEFSYMFILES += def-hfs.lst
-UNDSYMFILES += und-hfs.lst
-
-hfs.mod: pre-hfs.o mod-hfs.o
-	-rm -f $@
-	$(LD) $(hfs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-hfs.o: hfs_mod-fs_hfs.o
-	-rm -f $@
-	$(LD) $(hfs_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-hfs.o: mod-hfs.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -c -o $@ $<
-
-mod-hfs.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'hfs' $< > $@ || (rm -f $@; exit 1)
-
-def-hfs.lst: pre-hfs.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 hfs/' > $@
-
-und-hfs.lst: pre-hfs.o
-	echo 'hfs' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-hfs_mod-fs_hfs.o: fs/hfs.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -c -o $@ $<
-
-hfs_mod-fs_hfs.d: fs/hfs.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -M $< 	  | sed 's,hfs\.o[ :]*,hfs_mod-fs_hfs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include hfs_mod-fs_hfs.d
-
-CLEANFILES += cmd-hfs.lst fs-hfs.lst
-COMMANDFILES += cmd-hfs.lst
-FSFILES += fs-hfs.lst
-
-cmd-hfs.lst: fs/hfs.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh hfs > $@ || (rm -f $@; exit 1)
-
-fs-hfs.lst: fs/hfs.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh hfs > $@ || (rm -f $@; exit 1)
-
-
-hfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jfs.mod.
-jfs_mod_SOURCES = fs/jfs.c
-CLEANFILES += jfs.mod mod-jfs.o mod-jfs.c pre-jfs.o jfs_mod-fs_jfs.o def-jfs.lst und-jfs.lst
-MOSTLYCLEANFILES += jfs_mod-fs_jfs.d
-DEFSYMFILES += def-jfs.lst
-UNDSYMFILES += und-jfs.lst
-
-jfs.mod: pre-jfs.o mod-jfs.o
-	-rm -f $@
-	$(LD) $(jfs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-jfs.o: jfs_mod-fs_jfs.o
-	-rm -f $@
-	$(LD) $(jfs_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-jfs.o: mod-jfs.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -c -o $@ $<
-
-mod-jfs.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'jfs' $< > $@ || (rm -f $@; exit 1)
-
-def-jfs.lst: pre-jfs.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 jfs/' > $@
-
-und-jfs.lst: pre-jfs.o
-	echo 'jfs' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-jfs_mod-fs_jfs.o: fs/jfs.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -c -o $@ $<
-
-jfs_mod-fs_jfs.d: fs/jfs.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -M $< 	  | sed 's,jfs\.o[ :]*,jfs_mod-fs_jfs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include jfs_mod-fs_jfs.d
-
-CLEANFILES += cmd-jfs.lst fs-jfs.lst
-COMMANDFILES += cmd-jfs.lst
-FSFILES += fs-jfs.lst
-
-cmd-jfs.lst: fs/jfs.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh jfs > $@ || (rm -f $@; exit 1)
-
-fs-jfs.lst: fs/jfs.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh jfs > $@ || (rm -f $@; exit 1)
-
-
-jfs_mod_CFLAGS = $(COMMON_CFLAGS)
-jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For iso9660.mod.
-iso9660_mod_SOURCES = fs/iso9660.c
-iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
-iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For xfs.mod.
-xfs_mod_SOURCES = fs/xfs.c
-CLEANFILES += xfs.mod mod-xfs.o mod-xfs.c pre-xfs.o xfs_mod-fs_xfs.o def-xfs.lst und-xfs.lst
-MOSTLYCLEANFILES += xfs_mod-fs_xfs.d
-DEFSYMFILES += def-xfs.lst
-UNDSYMFILES += und-xfs.lst
-
-xfs.mod: pre-xfs.o mod-xfs.o
-	-rm -f $@
-	$(LD) $(xfs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-xfs.o: xfs_mod-fs_xfs.o
-	-rm -f $@
-	$(LD) $(xfs_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-xfs.o: mod-xfs.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -c -o $@ $<
-
-mod-xfs.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'xfs' $< > $@ || (rm -f $@; exit 1)
-
-def-xfs.lst: pre-xfs.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 xfs/' > $@
-
-und-xfs.lst: pre-xfs.o
-	echo 'xfs' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-xfs_mod-fs_xfs.o: fs/xfs.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -c -o $@ $<
-
-xfs_mod-fs_xfs.d: fs/xfs.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -M $< 	  | sed 's,xfs\.o[ :]*,xfs_mod-fs_xfs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include xfs_mod-fs_xfs.d
-
-CLEANFILES += cmd-xfs.lst fs-xfs.lst
-COMMANDFILES += cmd-xfs.lst
-FSFILES += fs-xfs.lst
-
-cmd-xfs.lst: fs/xfs.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh xfs > $@ || (rm -f $@; exit 1)
-
-fs-xfs.lst: fs/xfs.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh xfs > $@ || (rm -f $@; exit 1)
-
-
-xfs_mod_CFLAGS = $(COMMON_CFLAGS)
-xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For affs.mod.
-affs_mod_SOURCES = fs/affs.c
-CLEANFILES += affs.mod mod-affs.o mod-affs.c pre-affs.o affs_mod-fs_affs.o def-affs.lst und-affs.lst
-MOSTLYCLEANFILES += affs_mod-fs_affs.d
-DEFSYMFILES += def-affs.lst
-UNDSYMFILES += und-affs.lst
-
-affs.mod: pre-affs.o mod-affs.o
-	-rm -f $@
-	$(LD) $(affs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-affs.o: affs_mod-fs_affs.o
-	-rm -f $@
-	$(LD) $(affs_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-affs.o: mod-affs.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -c -o $@ $<
-
-mod-affs.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'affs' $< > $@ || (rm -f $@; exit 1)
-
-def-affs.lst: pre-affs.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 affs/' > $@
-
-und-affs.lst: pre-affs.o
-	echo 'affs' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-affs_mod-fs_affs.o: fs/affs.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -c -o $@ $<
-
-affs_mod-fs_affs.d: fs/affs.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -M $< 	  | sed 's,affs\.o[ :]*,affs_mod-fs_affs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include affs_mod-fs_affs.d
-
-CLEANFILES += cmd-affs.lst fs-affs.lst
-COMMANDFILES += cmd-affs.lst
-FSFILES += fs-affs.lst
-
-cmd-affs.lst: fs/affs.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh affs > $@ || (rm -f $@; exit 1)
-
-fs-affs.lst: fs/affs.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh affs > $@ || (rm -f $@; exit 1)
-
-
-affs_mod_CFLAGS = $(COMMON_CFLAGS)
-affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sfs.mod.
-sfs_mod_SOURCES = fs/sfs.c
-CLEANFILES += sfs.mod mod-sfs.o mod-sfs.c pre-sfs.o sfs_mod-fs_sfs.o def-sfs.lst und-sfs.lst
-MOSTLYCLEANFILES += sfs_mod-fs_sfs.d
-DEFSYMFILES += def-sfs.lst
-UNDSYMFILES += und-sfs.lst
-
-sfs.mod: pre-sfs.o mod-sfs.o
-	-rm -f $@
-	$(LD) $(sfs_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-sfs.o: sfs_mod-fs_sfs.o
-	-rm -f $@
-	$(LD) $(sfs_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-sfs.o: mod-sfs.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -c -o $@ $<
-
-mod-sfs.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'sfs' $< > $@ || (rm -f $@; exit 1)
-
-def-sfs.lst: pre-sfs.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 sfs/' > $@
-
-und-sfs.lst: pre-sfs.o
-	echo 'sfs' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-sfs_mod-fs_sfs.o: fs/sfs.c
-	$(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -c -o $@ $<
-
-sfs_mod-fs_sfs.d: fs/sfs.c
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -M $< 	  | sed 's,sfs\.o[ :]*,sfs_mod-fs_sfs.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include sfs_mod-fs_sfs.d
-
-CLEANFILES += cmd-sfs.lst fs-sfs.lst
-COMMANDFILES += cmd-sfs.lst
-FSFILES += fs-sfs.lst
-
-cmd-sfs.lst: fs/sfs.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh sfs > $@ || (rm -f $@; exit 1)
-
-fs-sfs.lst: fs/sfs.c genfslist.sh
-	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh sfs > $@ || (rm -f $@; exit 1)
-
-
-sfs_mod_CFLAGS = $(COMMON_CFLAGS)
-sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For _linux.mod.
 _linux_mod_SOURCES = loader/i386/pc/linux.c
 CLEANFILES += _linux.mod mod-_linux.o mod-_linux.c pre-_linux.o _linux_mod-loader_i386_pc_linux.o def-_linux.lst und-_linux.lst
@@ -2012,14 +1477,14 @@ _linux_mod-loader_i386_pc_linux.d: loader/i386/pc/linux.c
 
 -include _linux_mod-loader_i386_pc_linux.d
 
-CLEANFILES += cmd-linux.lst fs-linux.lst
-COMMANDFILES += cmd-linux.lst
-FSFILES += fs-linux.lst
+CLEANFILES += cmd-_linux_mod-loader_i386_pc_linux.lst fs-_linux_mod-loader_i386_pc_linux.lst
+COMMANDFILES += cmd-_linux_mod-loader_i386_pc_linux.lst
+FSFILES += fs-_linux_mod-loader_i386_pc_linux.lst
 
-cmd-linux.lst: loader/i386/pc/linux.c gencmdlist.sh
+cmd-_linux_mod-loader_i386_pc_linux.lst: loader/i386/pc/linux.c gencmdlist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(_linux_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh _linux > $@ || (rm -f $@; exit 1)
 
-fs-linux.lst: loader/i386/pc/linux.c genfslist.sh
+fs-_linux_mod-loader_i386_pc_linux.lst: loader/i386/pc/linux.c genfslist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(_linux_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh _linux > $@ || (rm -f $@; exit 1)
 
 
@@ -2063,14 +1528,14 @@ linux_mod-loader_i386_pc_linux_normal.d: loader/i386/pc/linux_normal.c
 
 -include linux_mod-loader_i386_pc_linux_normal.d
 
-CLEANFILES += cmd-linux_normal.lst fs-linux_normal.lst
-COMMANDFILES += cmd-linux_normal.lst
-FSFILES += fs-linux_normal.lst
+CLEANFILES += cmd-linux_mod-loader_i386_pc_linux_normal.lst fs-linux_mod-loader_i386_pc_linux_normal.lst
+COMMANDFILES += cmd-linux_mod-loader_i386_pc_linux_normal.lst
+FSFILES += fs-linux_mod-loader_i386_pc_linux_normal.lst
 
-cmd-linux_normal.lst: loader/i386/pc/linux_normal.c gencmdlist.sh
+cmd-linux_mod-loader_i386_pc_linux_normal.lst: loader/i386/pc/linux_normal.c gencmdlist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(linux_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh linux > $@ || (rm -f $@; exit 1)
 
-fs-linux_normal.lst: loader/i386/pc/linux_normal.c genfslist.sh
+fs-linux_mod-loader_i386_pc_linux_normal.lst: loader/i386/pc/linux_normal.c genfslist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(linux_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh linux > $@ || (rm -f $@; exit 1)
 
 
@@ -2118,14 +1583,14 @@ normal_mod-normal_arg.d: normal/arg.c
 
 -include normal_mod-normal_arg.d
 
-CLEANFILES += cmd-arg.lst fs-arg.lst
-COMMANDFILES += cmd-arg.lst
-FSFILES += fs-arg.lst
+CLEANFILES += cmd-normal_mod-normal_arg.lst fs-normal_mod-normal_arg.lst
+COMMANDFILES += cmd-normal_mod-normal_arg.lst
+FSFILES += fs-normal_mod-normal_arg.lst
 
-cmd-arg.lst: normal/arg.c gencmdlist.sh
+cmd-normal_mod-normal_arg.lst: normal/arg.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-arg.lst: normal/arg.c genfslist.sh
+fs-normal_mod-normal_arg.lst: normal/arg.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2137,14 +1602,14 @@ normal_mod-normal_cmdline.d: normal/cmdline.c
 
 -include normal_mod-normal_cmdline.d
 
-CLEANFILES += cmd-cmdline.lst fs-cmdline.lst
-COMMANDFILES += cmd-cmdline.lst
-FSFILES += fs-cmdline.lst
+CLEANFILES += cmd-normal_mod-normal_cmdline.lst fs-normal_mod-normal_cmdline.lst
+COMMANDFILES += cmd-normal_mod-normal_cmdline.lst
+FSFILES += fs-normal_mod-normal_cmdline.lst
 
-cmd-cmdline.lst: normal/cmdline.c gencmdlist.sh
+cmd-normal_mod-normal_cmdline.lst: normal/cmdline.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-cmdline.lst: normal/cmdline.c genfslist.sh
+fs-normal_mod-normal_cmdline.lst: normal/cmdline.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2156,14 +1621,14 @@ normal_mod-normal_command.d: normal/command.c
 
 -include normal_mod-normal_command.d
 
-CLEANFILES += cmd-command.lst fs-command.lst
-COMMANDFILES += cmd-command.lst
-FSFILES += fs-command.lst
+CLEANFILES += cmd-normal_mod-normal_command.lst fs-normal_mod-normal_command.lst
+COMMANDFILES += cmd-normal_mod-normal_command.lst
+FSFILES += fs-normal_mod-normal_command.lst
 
-cmd-command.lst: normal/command.c gencmdlist.sh
+cmd-normal_mod-normal_command.lst: normal/command.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-command.lst: normal/command.c genfslist.sh
+fs-normal_mod-normal_command.lst: normal/command.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2175,14 +1640,14 @@ normal_mod-normal_completion.d: normal/completion.c
 
 -include normal_mod-normal_completion.d
 
-CLEANFILES += cmd-completion.lst fs-completion.lst
-COMMANDFILES += cmd-completion.lst
-FSFILES += fs-completion.lst
+CLEANFILES += cmd-normal_mod-normal_completion.lst fs-normal_mod-normal_completion.lst
+COMMANDFILES += cmd-normal_mod-normal_completion.lst
+FSFILES += fs-normal_mod-normal_completion.lst
 
-cmd-completion.lst: normal/completion.c gencmdlist.sh
+cmd-normal_mod-normal_completion.lst: normal/completion.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-completion.lst: normal/completion.c genfslist.sh
+fs-normal_mod-normal_completion.lst: normal/completion.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2194,14 +1659,14 @@ normal_mod-normal_context.d: normal/context.c
 
 -include normal_mod-normal_context.d
 
-CLEANFILES += cmd-context.lst fs-context.lst
-COMMANDFILES += cmd-context.lst
-FSFILES += fs-context.lst
+CLEANFILES += cmd-normal_mod-normal_context.lst fs-normal_mod-normal_context.lst
+COMMANDFILES += cmd-normal_mod-normal_context.lst
+FSFILES += fs-normal_mod-normal_context.lst
 
-cmd-context.lst: normal/context.c gencmdlist.sh
+cmd-normal_mod-normal_context.lst: normal/context.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-context.lst: normal/context.c genfslist.sh
+fs-normal_mod-normal_context.lst: normal/context.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2213,14 +1678,14 @@ normal_mod-normal_execute.d: normal/execute.c
 
 -include normal_mod-normal_execute.d
 
-CLEANFILES += cmd-execute.lst fs-execute.lst
-COMMANDFILES += cmd-execute.lst
-FSFILES += fs-execute.lst
+CLEANFILES += cmd-normal_mod-normal_execute.lst fs-normal_mod-normal_execute.lst
+COMMANDFILES += cmd-normal_mod-normal_execute.lst
+FSFILES += fs-normal_mod-normal_execute.lst
 
-cmd-execute.lst: normal/execute.c gencmdlist.sh
+cmd-normal_mod-normal_execute.lst: normal/execute.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-execute.lst: normal/execute.c genfslist.sh
+fs-normal_mod-normal_execute.lst: normal/execute.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2232,14 +1697,14 @@ normal_mod-normal_function.d: normal/function.c
 
 -include normal_mod-normal_function.d
 
-CLEANFILES += cmd-function.lst fs-function.lst
-COMMANDFILES += cmd-function.lst
-FSFILES += fs-function.lst
+CLEANFILES += cmd-normal_mod-normal_function.lst fs-normal_mod-normal_function.lst
+COMMANDFILES += cmd-normal_mod-normal_function.lst
+FSFILES += fs-normal_mod-normal_function.lst
 
-cmd-function.lst: normal/function.c gencmdlist.sh
+cmd-normal_mod-normal_function.lst: normal/function.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-function.lst: normal/function.c genfslist.sh
+fs-normal_mod-normal_function.lst: normal/function.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2251,14 +1716,14 @@ normal_mod-normal_lexer.d: normal/lexer.c
 
 -include normal_mod-normal_lexer.d
 
-CLEANFILES += cmd-lexer.lst fs-lexer.lst
-COMMANDFILES += cmd-lexer.lst
-FSFILES += fs-lexer.lst
+CLEANFILES += cmd-normal_mod-normal_lexer.lst fs-normal_mod-normal_lexer.lst
+COMMANDFILES += cmd-normal_mod-normal_lexer.lst
+FSFILES += fs-normal_mod-normal_lexer.lst
 
-cmd-lexer.lst: normal/lexer.c gencmdlist.sh
+cmd-normal_mod-normal_lexer.lst: normal/lexer.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-lexer.lst: normal/lexer.c genfslist.sh
+fs-normal_mod-normal_lexer.lst: normal/lexer.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2270,14 +1735,14 @@ normal_mod-normal_main.d: normal/main.c
 
 -include normal_mod-normal_main.d
 
-CLEANFILES += cmd-main.lst fs-main.lst
-COMMANDFILES += cmd-main.lst
-FSFILES += fs-main.lst
+CLEANFILES += cmd-normal_mod-normal_main.lst fs-normal_mod-normal_main.lst
+COMMANDFILES += cmd-normal_mod-normal_main.lst
+FSFILES += fs-normal_mod-normal_main.lst
 
-cmd-main.lst: normal/main.c gencmdlist.sh
+cmd-normal_mod-normal_main.lst: normal/main.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-main.lst: normal/main.c genfslist.sh
+fs-normal_mod-normal_main.lst: normal/main.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2289,14 +1754,14 @@ normal_mod-normal_menu.d: normal/menu.c
 
 -include normal_mod-normal_menu.d
 
-CLEANFILES += cmd-menu.lst fs-menu.lst
-COMMANDFILES += cmd-menu.lst
-FSFILES += fs-menu.lst
+CLEANFILES += cmd-normal_mod-normal_menu.lst fs-normal_mod-normal_menu.lst
+COMMANDFILES += cmd-normal_mod-normal_menu.lst
+FSFILES += fs-normal_mod-normal_menu.lst
 
-cmd-menu.lst: normal/menu.c gencmdlist.sh
+cmd-normal_mod-normal_menu.lst: normal/menu.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-menu.lst: normal/menu.c genfslist.sh
+fs-normal_mod-normal_menu.lst: normal/menu.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2308,14 +1773,14 @@ normal_mod-normal_menu_entry.d: normal/menu_entry.c
 
 -include normal_mod-normal_menu_entry.d
 
-CLEANFILES += cmd-menu_entry.lst fs-menu_entry.lst
-COMMANDFILES += cmd-menu_entry.lst
-FSFILES += fs-menu_entry.lst
+CLEANFILES += cmd-normal_mod-normal_menu_entry.lst fs-normal_mod-normal_menu_entry.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_entry.lst
+FSFILES += fs-normal_mod-normal_menu_entry.lst
 
-cmd-menu_entry.lst: normal/menu_entry.c gencmdlist.sh
+cmd-normal_mod-normal_menu_entry.lst: normal/menu_entry.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-menu_entry.lst: normal/menu_entry.c genfslist.sh
+fs-normal_mod-normal_menu_entry.lst: normal/menu_entry.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2327,14 +1792,14 @@ normal_mod-normal_misc.d: normal/misc.c
 
 -include normal_mod-normal_misc.d
 
-CLEANFILES += cmd-misc.lst fs-misc.lst
-COMMANDFILES += cmd-misc.lst
-FSFILES += fs-misc.lst
+CLEANFILES += cmd-normal_mod-normal_misc.lst fs-normal_mod-normal_misc.lst
+COMMANDFILES += cmd-normal_mod-normal_misc.lst
+FSFILES += fs-normal_mod-normal_misc.lst
 
-cmd-misc.lst: normal/misc.c gencmdlist.sh
+cmd-normal_mod-normal_misc.lst: normal/misc.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-misc.lst: normal/misc.c genfslist.sh
+fs-normal_mod-normal_misc.lst: normal/misc.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2346,14 +1811,14 @@ normal_mod-grub_script_tab.d: grub_script.tab.c
 
 -include normal_mod-grub_script_tab.d
 
-CLEANFILES += cmd-grub_script.tab.lst fs-grub_script.tab.lst
-COMMANDFILES += cmd-grub_script.tab.lst
-FSFILES += fs-grub_script.tab.lst
+CLEANFILES += cmd-normal_mod-grub_script_tab.lst fs-normal_mod-grub_script_tab.lst
+COMMANDFILES += cmd-normal_mod-grub_script_tab.lst
+FSFILES += fs-normal_mod-grub_script_tab.lst
 
-cmd-grub_script.tab.lst: grub_script.tab.c gencmdlist.sh
+cmd-normal_mod-grub_script_tab.lst: grub_script.tab.c gencmdlist.sh
 	set -e; 	  $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-grub_script.tab.lst: grub_script.tab.c genfslist.sh
+fs-normal_mod-grub_script_tab.lst: grub_script.tab.c genfslist.sh
 	set -e; 	  $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2365,14 +1830,14 @@ normal_mod-normal_script.d: normal/script.c
 
 -include normal_mod-normal_script.d
 
-CLEANFILES += cmd-script.lst fs-script.lst
-COMMANDFILES += cmd-script.lst
-FSFILES += fs-script.lst
+CLEANFILES += cmd-normal_mod-normal_script.lst fs-normal_mod-normal_script.lst
+COMMANDFILES += cmd-normal_mod-normal_script.lst
+FSFILES += fs-normal_mod-normal_script.lst
 
-cmd-script.lst: normal/script.c gencmdlist.sh
+cmd-normal_mod-normal_script.lst: normal/script.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-script.lst: normal/script.c genfslist.sh
+fs-normal_mod-normal_script.lst: normal/script.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2384,14 +1849,14 @@ normal_mod-normal_i386_setjmp.d: normal/i386/setjmp.S
 
 -include normal_mod-normal_i386_setjmp.d
 
-CLEANFILES += cmd-setjmp.lst fs-setjmp.lst
-COMMANDFILES += cmd-setjmp.lst
-FSFILES += fs-setjmp.lst
+CLEANFILES += cmd-normal_mod-normal_i386_setjmp.lst fs-normal_mod-normal_i386_setjmp.lst
+COMMANDFILES += cmd-normal_mod-normal_i386_setjmp.lst
+FSFILES += fs-normal_mod-normal_i386_setjmp.lst
 
-cmd-setjmp.lst: normal/i386/setjmp.S gencmdlist.sh
+cmd-normal_mod-normal_i386_setjmp.lst: normal/i386/setjmp.S gencmdlist.sh
 	set -e; 	  $(CC) -Inormal/i386 -I$(srcdir)/normal/i386 $(CPPFLAGS) $(ASFLAGS) $(normal_mod_ASFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-setjmp.lst: normal/i386/setjmp.S genfslist.sh
+fs-normal_mod-normal_i386_setjmp.lst: normal/i386/setjmp.S genfslist.sh
 	set -e; 	  $(CC) -Inormal/i386 -I$(srcdir)/normal/i386 $(CPPFLAGS) $(ASFLAGS) $(normal_mod_ASFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -2399,363 +1864,6 @@ normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_ASFLAGS = $(COMMON_ASFLAGS) -m32
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For hello.mod.
-hello_mod_SOURCES = hello/hello.c
-CLEANFILES += hello.mod mod-hello.o mod-hello.c pre-hello.o hello_mod-hello_hello.o def-hello.lst und-hello.lst
-MOSTLYCLEANFILES += hello_mod-hello_hello.d
-DEFSYMFILES += def-hello.lst
-UNDSYMFILES += und-hello.lst
-
-hello.mod: pre-hello.o mod-hello.o
-	-rm -f $@
-	$(LD) $(hello_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-hello.o: hello_mod-hello_hello.o
-	-rm -f $@
-	$(LD) $(hello_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-hello.o: mod-hello.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -c -o $@ $<
-
-mod-hello.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'hello' $< > $@ || (rm -f $@; exit 1)
-
-def-hello.lst: pre-hello.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 hello/' > $@
-
-und-hello.lst: pre-hello.o
-	echo 'hello' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-hello_mod-hello_hello.o: hello/hello.c
-	$(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -c -o $@ $<
-
-hello_mod-hello_hello.d: hello/hello.c
-	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -M $< 	  | sed 's,hello\.o[ :]*,hello_mod-hello_hello.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include hello_mod-hello_hello.d
-
-CLEANFILES += cmd-hello.lst fs-hello.lst
-COMMANDFILES += cmd-hello.lst
-FSFILES += fs-hello.lst
-
-cmd-hello.lst: hello/hello.c gencmdlist.sh
-	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh hello > $@ || (rm -f $@; exit 1)
-
-fs-hello.lst: hello/hello.c genfslist.sh
-	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh hello > $@ || (rm -f $@; exit 1)
-
-
-hello_mod_CFLAGS = $(COMMON_CFLAGS)
-hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For boot.mod.
-boot_mod_SOURCES = commands/boot.c
-CLEANFILES += boot.mod mod-boot.o mod-boot.c pre-boot.o boot_mod-commands_boot.o def-boot.lst und-boot.lst
-MOSTLYCLEANFILES += boot_mod-commands_boot.d
-DEFSYMFILES += def-boot.lst
-UNDSYMFILES += und-boot.lst
-
-boot.mod: pre-boot.o mod-boot.o
-	-rm -f $@
-	$(LD) $(boot_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-boot.o: boot_mod-commands_boot.o
-	-rm -f $@
-	$(LD) $(boot_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-boot.o: mod-boot.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -c -o $@ $<
-
-mod-boot.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'boot' $< > $@ || (rm -f $@; exit 1)
-
-def-boot.lst: pre-boot.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 boot/' > $@
-
-und-boot.lst: pre-boot.o
-	echo 'boot' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-boot_mod-commands_boot.o: commands/boot.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -c -o $@ $<
-
-boot_mod-commands_boot.d: commands/boot.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -M $< 	  | sed 's,boot\.o[ :]*,boot_mod-commands_boot.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include boot_mod-commands_boot.d
-
-CLEANFILES += cmd-boot.lst fs-boot.lst
-COMMANDFILES += cmd-boot.lst
-FSFILES += fs-boot.lst
-
-cmd-boot.lst: commands/boot.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh boot > $@ || (rm -f $@; exit 1)
-
-fs-boot.lst: commands/boot.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh boot > $@ || (rm -f $@; exit 1)
-
-
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminal.mod.
-terminal_mod_SOURCES = commands/terminal.c
-CLEANFILES += terminal.mod mod-terminal.o mod-terminal.c pre-terminal.o terminal_mod-commands_terminal.o def-terminal.lst und-terminal.lst
-MOSTLYCLEANFILES += terminal_mod-commands_terminal.d
-DEFSYMFILES += def-terminal.lst
-UNDSYMFILES += und-terminal.lst
-
-terminal.mod: pre-terminal.o mod-terminal.o
-	-rm -f $@
-	$(LD) $(terminal_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-terminal.o: terminal_mod-commands_terminal.o
-	-rm -f $@
-	$(LD) $(terminal_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-terminal.o: mod-terminal.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -c -o $@ $<
-
-mod-terminal.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'terminal' $< > $@ || (rm -f $@; exit 1)
-
-def-terminal.lst: pre-terminal.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 terminal/' > $@
-
-und-terminal.lst: pre-terminal.o
-	echo 'terminal' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-terminal_mod-commands_terminal.o: commands/terminal.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -c -o $@ $<
-
-terminal_mod-commands_terminal.d: commands/terminal.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -M $< 	  | sed 's,terminal\.o[ :]*,terminal_mod-commands_terminal.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include terminal_mod-commands_terminal.d
-
-CLEANFILES += cmd-terminal.lst fs-terminal.lst
-COMMANDFILES += cmd-terminal.lst
-FSFILES += fs-terminal.lst
-
-cmd-terminal.lst: commands/terminal.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh terminal > $@ || (rm -f $@; exit 1)
-
-fs-terminal.lst: commands/terminal.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh terminal > $@ || (rm -f $@; exit 1)
-
-
-terminal_mod_CFLAGS = $(COMMON_CFLAGS)
-terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ls.mod.
-ls_mod_SOURCES = commands/ls.c
-CLEANFILES += ls.mod mod-ls.o mod-ls.c pre-ls.o ls_mod-commands_ls.o def-ls.lst und-ls.lst
-MOSTLYCLEANFILES += ls_mod-commands_ls.d
-DEFSYMFILES += def-ls.lst
-UNDSYMFILES += und-ls.lst
-
-ls.mod: pre-ls.o mod-ls.o
-	-rm -f $@
-	$(LD) $(ls_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-ls.o: ls_mod-commands_ls.o
-	-rm -f $@
-	$(LD) $(ls_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-ls.o: mod-ls.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -c -o $@ $<
-
-mod-ls.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'ls' $< > $@ || (rm -f $@; exit 1)
-
-def-ls.lst: pre-ls.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 ls/' > $@
-
-und-ls.lst: pre-ls.o
-	echo 'ls' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-ls_mod-commands_ls.o: commands/ls.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -c -o $@ $<
-
-ls_mod-commands_ls.d: commands/ls.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -M $< 	  | sed 's,ls\.o[ :]*,ls_mod-commands_ls.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include ls_mod-commands_ls.d
-
-CLEANFILES += cmd-ls.lst fs-ls.lst
-COMMANDFILES += cmd-ls.lst
-FSFILES += fs-ls.lst
-
-cmd-ls.lst: commands/ls.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ls > $@ || (rm -f $@; exit 1)
-
-fs-ls.lst: commands/ls.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ls > $@ || (rm -f $@; exit 1)
-
-
-ls_mod_CFLAGS = $(COMMON_CFLAGS)
-ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmp.mod.
-cmp_mod_SOURCES = commands/cmp.c
-CLEANFILES += cmp.mod mod-cmp.o mod-cmp.c pre-cmp.o cmp_mod-commands_cmp.o def-cmp.lst und-cmp.lst
-MOSTLYCLEANFILES += cmp_mod-commands_cmp.d
-DEFSYMFILES += def-cmp.lst
-UNDSYMFILES += und-cmp.lst
-
-cmp.mod: pre-cmp.o mod-cmp.o
-	-rm -f $@
-	$(LD) $(cmp_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-cmp.o: cmp_mod-commands_cmp.o
-	-rm -f $@
-	$(LD) $(cmp_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-cmp.o: mod-cmp.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -c -o $@ $<
-
-mod-cmp.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'cmp' $< > $@ || (rm -f $@; exit 1)
-
-def-cmp.lst: pre-cmp.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cmp/' > $@
-
-und-cmp.lst: pre-cmp.o
-	echo 'cmp' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-cmp_mod-commands_cmp.o: commands/cmp.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -c -o $@ $<
-
-cmp_mod-commands_cmp.d: commands/cmp.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -M $< 	  | sed 's,cmp\.o[ :]*,cmp_mod-commands_cmp.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include cmp_mod-commands_cmp.d
-
-CLEANFILES += cmd-cmp.lst fs-cmp.lst
-COMMANDFILES += cmd-cmp.lst
-FSFILES += fs-cmp.lst
-
-cmd-cmp.lst: commands/cmp.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh cmp > $@ || (rm -f $@; exit 1)
-
-fs-cmp.lst: commands/cmp.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh cmp > $@ || (rm -f $@; exit 1)
-
-
-cmp_mod_CFLAGS = $(COMMON_CFLAGS)
-cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cat.mod.
-cat_mod_SOURCES = commands/cat.c
-CLEANFILES += cat.mod mod-cat.o mod-cat.c pre-cat.o cat_mod-commands_cat.o def-cat.lst und-cat.lst
-MOSTLYCLEANFILES += cat_mod-commands_cat.d
-DEFSYMFILES += def-cat.lst
-UNDSYMFILES += und-cat.lst
-
-cat.mod: pre-cat.o mod-cat.o
-	-rm -f $@
-	$(LD) $(cat_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-cat.o: cat_mod-commands_cat.o
-	-rm -f $@
-	$(LD) $(cat_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-cat.o: mod-cat.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -c -o $@ $<
-
-mod-cat.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'cat' $< > $@ || (rm -f $@; exit 1)
-
-def-cat.lst: pre-cat.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cat/' > $@
-
-und-cat.lst: pre-cat.o
-	echo 'cat' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-cat_mod-commands_cat.o: commands/cat.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -c -o $@ $<
-
-cat_mod-commands_cat.d: commands/cat.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -M $< 	  | sed 's,cat\.o[ :]*,cat_mod-commands_cat.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include cat_mod-commands_cat.d
-
-CLEANFILES += cmd-cat.lst fs-cat.lst
-COMMANDFILES += cmd-cat.lst
-FSFILES += fs-cat.lst
-
-cmd-cat.lst: commands/cat.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh cat > $@ || (rm -f $@; exit 1)
-
-fs-cat.lst: commands/cat.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh cat > $@ || (rm -f $@; exit 1)
-
-
-cat_mod_CFLAGS = $(COMMON_CFLAGS)
-cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For help.mod.
-help_mod_SOURCES = commands/help.c
-CLEANFILES += help.mod mod-help.o mod-help.c pre-help.o help_mod-commands_help.o def-help.lst und-help.lst
-MOSTLYCLEANFILES += help_mod-commands_help.d
-DEFSYMFILES += def-help.lst
-UNDSYMFILES += und-help.lst
-
-help.mod: pre-help.o mod-help.o
-	-rm -f $@
-	$(LD) $(help_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-help.o: help_mod-commands_help.o
-	-rm -f $@
-	$(LD) $(help_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-help.o: mod-help.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -c -o $@ $<
-
-mod-help.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'help' $< > $@ || (rm -f $@; exit 1)
-
-def-help.lst: pre-help.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 help/' > $@
-
-und-help.lst: pre-help.o
-	echo 'help' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-help_mod-commands_help.o: commands/help.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -c -o $@ $<
-
-help_mod-commands_help.d: commands/help.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -M $< 	  | sed 's,help\.o[ :]*,help_mod-commands_help.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include help_mod-commands_help.d
-
-CLEANFILES += cmd-help.lst fs-help.lst
-COMMANDFILES += cmd-help.lst
-FSFILES += fs-help.lst
-
-cmd-help.lst: commands/help.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh help > $@ || (rm -f $@; exit 1)
-
-fs-help.lst: commands/help.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh help > $@ || (rm -f $@; exit 1)
-
-
-help_mod_CFLAGS = $(COMMON_CFLAGS)
-help_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For reboot.mod.
 reboot_mod_SOURCES = commands/i386/pc/reboot.c
 CLEANFILES += reboot.mod mod-reboot.o mod-reboot.c pre-reboot.o reboot_mod-commands_i386_pc_reboot.o def-reboot.lst und-reboot.lst
@@ -2793,14 +1901,14 @@ reboot_mod-commands_i386_pc_reboot.d: commands/i386/pc/reboot.c
 
 -include reboot_mod-commands_i386_pc_reboot.d
 
-CLEANFILES += cmd-reboot.lst fs-reboot.lst
-COMMANDFILES += cmd-reboot.lst
-FSFILES += fs-reboot.lst
+CLEANFILES += cmd-reboot_mod-commands_i386_pc_reboot.lst fs-reboot_mod-commands_i386_pc_reboot.lst
+COMMANDFILES += cmd-reboot_mod-commands_i386_pc_reboot.lst
+FSFILES += fs-reboot_mod-commands_i386_pc_reboot.lst
 
-cmd-reboot.lst: commands/i386/pc/reboot.c gencmdlist.sh
+cmd-reboot_mod-commands_i386_pc_reboot.lst: commands/i386/pc/reboot.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/i386/pc -I$(srcdir)/commands/i386/pc $(CPPFLAGS) $(CFLAGS) $(reboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh reboot > $@ || (rm -f $@; exit 1)
 
-fs-reboot.lst: commands/i386/pc/reboot.c genfslist.sh
+fs-reboot_mod-commands_i386_pc_reboot.lst: commands/i386/pc/reboot.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/i386/pc -I$(srcdir)/commands/i386/pc $(CPPFLAGS) $(CFLAGS) $(reboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh reboot > $@ || (rm -f $@; exit 1)
 
 
@@ -2844,14 +1952,14 @@ halt_mod-commands_i386_pc_halt.d: commands/i386/pc/halt.c
 
 -include halt_mod-commands_i386_pc_halt.d
 
-CLEANFILES += cmd-halt.lst fs-halt.lst
-COMMANDFILES += cmd-halt.lst
-FSFILES += fs-halt.lst
+CLEANFILES += cmd-halt_mod-commands_i386_pc_halt.lst fs-halt_mod-commands_i386_pc_halt.lst
+COMMANDFILES += cmd-halt_mod-commands_i386_pc_halt.lst
+FSFILES += fs-halt_mod-commands_i386_pc_halt.lst
 
-cmd-halt.lst: commands/i386/pc/halt.c gencmdlist.sh
+cmd-halt_mod-commands_i386_pc_halt.lst: commands/i386/pc/halt.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/i386/pc -I$(srcdir)/commands/i386/pc $(CPPFLAGS) $(CFLAGS) $(halt_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh halt > $@ || (rm -f $@; exit 1)
 
-fs-halt.lst: commands/i386/pc/halt.c genfslist.sh
+fs-halt_mod-commands_i386_pc_halt.lst: commands/i386/pc/halt.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/i386/pc -I$(srcdir)/commands/i386/pc $(CPPFLAGS) $(CFLAGS) $(halt_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh halt > $@ || (rm -f $@; exit 1)
 
 
@@ -2895,189 +2003,22 @@ vga_mod-term_i386_pc_vga.d: term/i386/pc/vga.c
 
 -include vga_mod-term_i386_pc_vga.d
 
-CLEANFILES += cmd-vga.lst fs-vga.lst
-COMMANDFILES += cmd-vga.lst
-FSFILES += fs-vga.lst
+CLEANFILES += cmd-vga_mod-term_i386_pc_vga.lst fs-vga_mod-term_i386_pc_vga.lst
+COMMANDFILES += cmd-vga_mod-term_i386_pc_vga.lst
+FSFILES += fs-vga_mod-term_i386_pc_vga.lst
 
-cmd-vga.lst: term/i386/pc/vga.c gencmdlist.sh
+cmd-vga_mod-term_i386_pc_vga.lst: term/i386/pc/vga.c gencmdlist.sh
 	set -e; 	  $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh vga > $@ || (rm -f $@; exit 1)
 
-fs-vga.lst: term/i386/pc/vga.c genfslist.sh
+fs-vga_mod-term_i386_pc_vga.lst: term/i386/pc/vga.c genfslist.sh
 	set -e; 	  $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh vga > $@ || (rm -f $@; exit 1)
 
 
 vga_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For font.mod.
-font_mod_SOURCES = font/manager.c
-CLEANFILES += font.mod mod-font.o mod-font.c pre-font.o font_mod-font_manager.o def-font.lst und-font.lst
-MOSTLYCLEANFILES += font_mod-font_manager.d
-DEFSYMFILES += def-font.lst
-UNDSYMFILES += und-font.lst
-
-font.mod: pre-font.o mod-font.o
-	-rm -f $@
-	$(LD) $(font_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-font.o: font_mod-font_manager.o
-	-rm -f $@
-	$(LD) $(font_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-font.o: mod-font.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -c -o $@ $<
-
-mod-font.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'font' $< > $@ || (rm -f $@; exit 1)
-
-def-font.lst: pre-font.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 font/' > $@
-
-und-font.lst: pre-font.o
-	echo 'font' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-font_mod-font_manager.o: font/manager.c
-	$(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -c -o $@ $<
-
-font_mod-font_manager.d: font/manager.c
-	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -M $< 	  | sed 's,manager\.o[ :]*,font_mod-font_manager.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include font_mod-font_manager.d
-
-CLEANFILES += cmd-manager.lst fs-manager.lst
-COMMANDFILES += cmd-manager.lst
-FSFILES += fs-manager.lst
-
-cmd-manager.lst: font/manager.c gencmdlist.sh
-	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh font > $@ || (rm -f $@; exit 1)
-
-fs-manager.lst: font/manager.c genfslist.sh
-	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh font > $@ || (rm -f $@; exit 1)
-
-
-font_mod_CFLAGS = $(COMMON_CFLAGS)
-font_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminfo.mod.
-terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
-CLEANFILES += terminfo.mod mod-terminfo.o mod-terminfo.c pre-terminfo.o terminfo_mod-term_terminfo.o terminfo_mod-term_tparm.o def-terminfo.lst und-terminfo.lst
-MOSTLYCLEANFILES += terminfo_mod-term_terminfo.d terminfo_mod-term_tparm.d
-DEFSYMFILES += def-terminfo.lst
-UNDSYMFILES += und-terminfo.lst
-
-terminfo.mod: pre-terminfo.o mod-terminfo.o
-	-rm -f $@
-	$(LD) $(terminfo_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-terminfo.o: terminfo_mod-term_terminfo.o terminfo_mod-term_tparm.o
-	-rm -f $@
-	$(LD) $(terminfo_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-terminfo.o: mod-terminfo.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -c -o $@ $<
-
-mod-terminfo.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'terminfo' $< > $@ || (rm -f $@; exit 1)
-
-def-terminfo.lst: pre-terminfo.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 terminfo/' > $@
-
-und-terminfo.lst: pre-terminfo.o
-	echo 'terminfo' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-terminfo_mod-term_terminfo.o: term/terminfo.c
-	$(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -c -o $@ $<
-
-terminfo_mod-term_terminfo.d: term/terminfo.c
-	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -M $< 	  | sed 's,terminfo\.o[ :]*,terminfo_mod-term_terminfo.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include terminfo_mod-term_terminfo.d
-
-CLEANFILES += cmd-terminfo.lst fs-terminfo.lst
-COMMANDFILES += cmd-terminfo.lst
-FSFILES += fs-terminfo.lst
-
-cmd-terminfo.lst: term/terminfo.c gencmdlist.sh
-	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh terminfo > $@ || (rm -f $@; exit 1)
-
-fs-terminfo.lst: term/terminfo.c genfslist.sh
-	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh terminfo > $@ || (rm -f $@; exit 1)
-
-
-terminfo_mod-term_tparm.o: term/tparm.c
-	$(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -c -o $@ $<
-
-terminfo_mod-term_tparm.d: term/tparm.c
-	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -M $< 	  | sed 's,tparm\.o[ :]*,terminfo_mod-term_tparm.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include terminfo_mod-term_tparm.d
-
-CLEANFILES += cmd-tparm.lst fs-tparm.lst
-COMMANDFILES += cmd-tparm.lst
-FSFILES += fs-tparm.lst
-
-cmd-tparm.lst: term/tparm.c gencmdlist.sh
-	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh terminfo > $@ || (rm -f $@; exit 1)
-
-fs-tparm.lst: term/tparm.c genfslist.sh
-	set -e; 	  $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(terminfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh terminfo > $@ || (rm -f $@; exit 1)
-
-
-terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
-terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For serial.mod.
 serial_mod_SOURCES = term/i386/pc/serial.c
-CLEANFILES += serial.mod mod-serial.o mod-serial.c pre-serial.o serial_mod-term_i386_pc_serial.o def-serial.lst und-serial.lst
-MOSTLYCLEANFILES += serial_mod-term_i386_pc_serial.d
-DEFSYMFILES += def-serial.lst
-UNDSYMFILES += und-serial.lst
-
-serial.mod: pre-serial.o mod-serial.o
-	-rm -f $@
-	$(LD) $(serial_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-serial.o: serial_mod-term_i386_pc_serial.o
-	-rm -f $@
-	$(LD) $(serial_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-serial.o: mod-serial.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(serial_mod_CFLAGS) -c -o $@ $<
-
-mod-serial.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'serial' $< > $@ || (rm -f $@; exit 1)
-
-def-serial.lst: pre-serial.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 serial/' > $@
-
-und-serial.lst: pre-serial.o
-	echo 'serial' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-serial_mod-term_i386_pc_serial.o: term/i386/pc/serial.c
-	$(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(serial_mod_CFLAGS) -c -o $@ $<
-
-serial_mod-term_i386_pc_serial.d: term/i386/pc/serial.c
-	set -e; 	  $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(serial_mod_CFLAGS) -M $< 	  | sed 's,serial\.o[ :]*,serial_mod-term_i386_pc_serial.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include serial_mod-term_i386_pc_serial.d
-
-CLEANFILES += cmd-serial.lst fs-serial.lst
-COMMANDFILES += cmd-serial.lst
-FSFILES += fs-serial.lst
-
-cmd-serial.lst: term/i386/pc/serial.c gencmdlist.sh
-	set -e; 	  $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(serial_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh serial > $@ || (rm -f $@; exit 1)
-
-fs-serial.lst: term/i386/pc/serial.c genfslist.sh
-	set -e; 	  $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(serial_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh serial > $@ || (rm -f $@; exit 1)
-
-
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
@@ -3118,14 +2059,14 @@ _multiboot_mod-loader_i386_pc_multiboot.d: loader/i386/pc/multiboot.c
 
 -include _multiboot_mod-loader_i386_pc_multiboot.d
 
-CLEANFILES += cmd-multiboot.lst fs-multiboot.lst
-COMMANDFILES += cmd-multiboot.lst
-FSFILES += fs-multiboot.lst
+CLEANFILES += cmd-_multiboot_mod-loader_i386_pc_multiboot.lst fs-_multiboot_mod-loader_i386_pc_multiboot.lst
+COMMANDFILES += cmd-_multiboot_mod-loader_i386_pc_multiboot.lst
+FSFILES += fs-_multiboot_mod-loader_i386_pc_multiboot.lst
 
-cmd-multiboot.lst: loader/i386/pc/multiboot.c gencmdlist.sh
+cmd-_multiboot_mod-loader_i386_pc_multiboot.lst: loader/i386/pc/multiboot.c gencmdlist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(_multiboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh _multiboot > $@ || (rm -f $@; exit 1)
 
-fs-multiboot.lst: loader/i386/pc/multiboot.c genfslist.sh
+fs-_multiboot_mod-loader_i386_pc_multiboot.lst: loader/i386/pc/multiboot.c genfslist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(_multiboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh _multiboot > $@ || (rm -f $@; exit 1)
 
 
@@ -3169,479 +2110,20 @@ multiboot_mod-loader_i386_pc_multiboot_normal.d: loader/i386/pc/multiboot_normal
 
 -include multiboot_mod-loader_i386_pc_multiboot_normal.d
 
-CLEANFILES += cmd-multiboot_normal.lst fs-multiboot_normal.lst
-COMMANDFILES += cmd-multiboot_normal.lst
-FSFILES += fs-multiboot_normal.lst
+CLEANFILES += cmd-multiboot_mod-loader_i386_pc_multiboot_normal.lst fs-multiboot_mod-loader_i386_pc_multiboot_normal.lst
+COMMANDFILES += cmd-multiboot_mod-loader_i386_pc_multiboot_normal.lst
+FSFILES += fs-multiboot_mod-loader_i386_pc_multiboot_normal.lst
 
-cmd-multiboot_normal.lst: loader/i386/pc/multiboot_normal.c gencmdlist.sh
+cmd-multiboot_mod-loader_i386_pc_multiboot_normal.lst: loader/i386/pc/multiboot_normal.c gencmdlist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(multiboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh multiboot > $@ || (rm -f $@; exit 1)
 
-fs-multiboot_normal.lst: loader/i386/pc/multiboot_normal.c genfslist.sh
+fs-multiboot_mod-loader_i386_pc_multiboot_normal.lst: loader/i386/pc/multiboot_normal.c genfslist.sh
 	set -e; 	  $(CC) -Iloader/i386/pc -I$(srcdir)/loader/i386/pc $(CPPFLAGS) $(CFLAGS) $(multiboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh multiboot > $@ || (rm -f $@; exit 1)
 
 
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For amiga.mod
-amiga_mod_SOURCES = partmap/amiga.c
-CLEANFILES += amiga.mod mod-amiga.o mod-amiga.c pre-amiga.o amiga_mod-partmap_amiga.o def-amiga.lst und-amiga.lst
-MOSTLYCLEANFILES += amiga_mod-partmap_amiga.d
-DEFSYMFILES += def-amiga.lst
-UNDSYMFILES += und-amiga.lst
-
-amiga.mod: pre-amiga.o mod-amiga.o
-	-rm -f $@
-	$(LD) $(amiga_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-amiga.o: amiga_mod-partmap_amiga.o
-	-rm -f $@
-	$(LD) $(amiga_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-amiga.o: mod-amiga.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -c -o $@ $<
-
-mod-amiga.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'amiga' $< > $@ || (rm -f $@; exit 1)
-
-def-amiga.lst: pre-amiga.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 amiga/' > $@
-
-und-amiga.lst: pre-amiga.o
-	echo 'amiga' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-amiga_mod-partmap_amiga.o: partmap/amiga.c
-	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -c -o $@ $<
-
-amiga_mod-partmap_amiga.d: partmap/amiga.c
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -M $< 	  | sed 's,amiga\.o[ :]*,amiga_mod-partmap_amiga.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include amiga_mod-partmap_amiga.d
-
-CLEANFILES += cmd-amiga.lst fs-amiga.lst
-COMMANDFILES += cmd-amiga.lst
-FSFILES += fs-amiga.lst
-
-cmd-amiga.lst: partmap/amiga.c gencmdlist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh amiga > $@ || (rm -f $@; exit 1)
-
-fs-amiga.lst: partmap/amiga.c genfslist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh amiga > $@ || (rm -f $@; exit 1)
-
-
-amiga_mod_CFLAGS = $(COMMON_CFLAGS)
-amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For apple.mod
-apple_mod_SOURCES = partmap/apple.c
-CLEANFILES += apple.mod mod-apple.o mod-apple.c pre-apple.o apple_mod-partmap_apple.o def-apple.lst und-apple.lst
-MOSTLYCLEANFILES += apple_mod-partmap_apple.d
-DEFSYMFILES += def-apple.lst
-UNDSYMFILES += und-apple.lst
-
-apple.mod: pre-apple.o mod-apple.o
-	-rm -f $@
-	$(LD) $(apple_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-apple.o: apple_mod-partmap_apple.o
-	-rm -f $@
-	$(LD) $(apple_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-apple.o: mod-apple.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -c -o $@ $<
-
-mod-apple.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'apple' $< > $@ || (rm -f $@; exit 1)
-
-def-apple.lst: pre-apple.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 apple/' > $@
-
-und-apple.lst: pre-apple.o
-	echo 'apple' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-apple_mod-partmap_apple.o: partmap/apple.c
-	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -c -o $@ $<
-
-apple_mod-partmap_apple.d: partmap/apple.c
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -M $< 	  | sed 's,apple\.o[ :]*,apple_mod-partmap_apple.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include apple_mod-partmap_apple.d
-
-CLEANFILES += cmd-apple.lst fs-apple.lst
-COMMANDFILES += cmd-apple.lst
-FSFILES += fs-apple.lst
-
-cmd-apple.lst: partmap/apple.c gencmdlist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh apple > $@ || (rm -f $@; exit 1)
-
-fs-apple.lst: partmap/apple.c genfslist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh apple > $@ || (rm -f $@; exit 1)
-
-
-apple_mod_CFLAGS = $(COMMON_CFLAGS)
-apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pc.mod
-pc_mod_SOURCES = partmap/pc.c
-CLEANFILES += pc.mod mod-pc.o mod-pc.c pre-pc.o pc_mod-partmap_pc.o def-pc.lst und-pc.lst
-MOSTLYCLEANFILES += pc_mod-partmap_pc.d
-DEFSYMFILES += def-pc.lst
-UNDSYMFILES += und-pc.lst
-
-pc.mod: pre-pc.o mod-pc.o
-	-rm -f $@
-	$(LD) $(pc_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-pc.o: pc_mod-partmap_pc.o
-	-rm -f $@
-	$(LD) $(pc_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-pc.o: mod-pc.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -c -o $@ $<
-
-mod-pc.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'pc' $< > $@ || (rm -f $@; exit 1)
-
-def-pc.lst: pre-pc.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 pc/' > $@
-
-und-pc.lst: pre-pc.o
-	echo 'pc' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-pc_mod-partmap_pc.o: partmap/pc.c
-	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -c -o $@ $<
-
-pc_mod-partmap_pc.d: partmap/pc.c
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -M $< 	  | sed 's,pc\.o[ :]*,pc_mod-partmap_pc.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include pc_mod-partmap_pc.d
-
-CLEANFILES += cmd-pc.lst fs-pc.lst
-COMMANDFILES += cmd-pc.lst
-FSFILES += fs-pc.lst
-
-cmd-pc.lst: partmap/pc.c gencmdlist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh pc > $@ || (rm -f $@; exit 1)
-
-fs-pc.lst: partmap/pc.c genfslist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh pc > $@ || (rm -f $@; exit 1)
-
-
-pc_mod_CFLAGS = $(COMMON_CFLAGS)
-pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sun.mod
-sun_mod_SOURCES = partmap/sun.c
-CLEANFILES += sun.mod mod-sun.o mod-sun.c pre-sun.o sun_mod-partmap_sun.o def-sun.lst und-sun.lst
-MOSTLYCLEANFILES += sun_mod-partmap_sun.d
-DEFSYMFILES += def-sun.lst
-UNDSYMFILES += und-sun.lst
-
-sun.mod: pre-sun.o mod-sun.o
-	-rm -f $@
-	$(LD) $(sun_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-sun.o: sun_mod-partmap_sun.o
-	-rm -f $@
-	$(LD) $(sun_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-sun.o: mod-sun.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -c -o $@ $<
-
-mod-sun.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'sun' $< > $@ || (rm -f $@; exit 1)
-
-def-sun.lst: pre-sun.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 sun/' > $@
-
-und-sun.lst: pre-sun.o
-	echo 'sun' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-sun_mod-partmap_sun.o: partmap/sun.c
-	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -c -o $@ $<
-
-sun_mod-partmap_sun.d: partmap/sun.c
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -M $< 	  | sed 's,sun\.o[ :]*,sun_mod-partmap_sun.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include sun_mod-partmap_sun.d
-
-CLEANFILES += cmd-sun.lst fs-sun.lst
-COMMANDFILES += cmd-sun.lst
-FSFILES += fs-sun.lst
-
-cmd-sun.lst: partmap/sun.c gencmdlist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh sun > $@ || (rm -f $@; exit 1)
-
-fs-sun.lst: partmap/sun.c genfslist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh sun > $@ || (rm -f $@; exit 1)
-
-
-sun_mod_CFLAGS = $(COMMON_CFLAGS)
-sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acorn.mod
-acorn_mod_SOURCES = partmap/acorn.c
-CLEANFILES += acorn.mod mod-acorn.o mod-acorn.c pre-acorn.o acorn_mod-partmap_acorn.o def-acorn.lst und-acorn.lst
-MOSTLYCLEANFILES += acorn_mod-partmap_acorn.d
-DEFSYMFILES += def-acorn.lst
-UNDSYMFILES += und-acorn.lst
-
-acorn.mod: pre-acorn.o mod-acorn.o
-	-rm -f $@
-	$(LD) $(acorn_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-acorn.o: acorn_mod-partmap_acorn.o
-	-rm -f $@
-	$(LD) $(acorn_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-acorn.o: mod-acorn.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -c -o $@ $<
-
-mod-acorn.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'acorn' $< > $@ || (rm -f $@; exit 1)
-
-def-acorn.lst: pre-acorn.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 acorn/' > $@
-
-und-acorn.lst: pre-acorn.o
-	echo 'acorn' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-acorn_mod-partmap_acorn.o: partmap/acorn.c
-	$(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -c -o $@ $<
-
-acorn_mod-partmap_acorn.d: partmap/acorn.c
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -M $< 	  | sed 's,acorn\.o[ :]*,acorn_mod-partmap_acorn.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include acorn_mod-partmap_acorn.d
-
-CLEANFILES += cmd-acorn.lst fs-acorn.lst
-COMMANDFILES += cmd-acorn.lst
-FSFILES += fs-acorn.lst
-
-cmd-acorn.lst: partmap/acorn.c gencmdlist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh acorn > $@ || (rm -f $@; exit 1)
-
-fs-acorn.lst: partmap/acorn.c genfslist.sh
-	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh acorn > $@ || (rm -f $@; exit 1)
-
-
-acorn_mod_CFLAGS = $(COMMON_CFLAGS)
-acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loopback.mod
-loopback_mod_SOURCES = disk/loopback.c
-CLEANFILES += loopback.mod mod-loopback.o mod-loopback.c pre-loopback.o loopback_mod-disk_loopback.o def-loopback.lst und-loopback.lst
-MOSTLYCLEANFILES += loopback_mod-disk_loopback.d
-DEFSYMFILES += def-loopback.lst
-UNDSYMFILES += und-loopback.lst
-
-loopback.mod: pre-loopback.o mod-loopback.o
-	-rm -f $@
-	$(LD) $(loopback_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-loopback.o: loopback_mod-disk_loopback.o
-	-rm -f $@
-	$(LD) $(loopback_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-loopback.o: mod-loopback.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -c -o $@ $<
-
-mod-loopback.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'loopback' $< > $@ || (rm -f $@; exit 1)
-
-def-loopback.lst: pre-loopback.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 loopback/' > $@
-
-und-loopback.lst: pre-loopback.o
-	echo 'loopback' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-loopback_mod-disk_loopback.o: disk/loopback.c
-	$(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -c -o $@ $<
-
-loopback_mod-disk_loopback.d: disk/loopback.c
-	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -M $< 	  | sed 's,loopback\.o[ :]*,loopback_mod-disk_loopback.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include loopback_mod-disk_loopback.d
-
-CLEANFILES += cmd-loopback.lst fs-loopback.lst
-COMMANDFILES += cmd-loopback.lst
-FSFILES += fs-loopback.lst
-
-cmd-loopback.lst: disk/loopback.c gencmdlist.sh
-	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh loopback > $@ || (rm -f $@; exit 1)
-
-fs-loopback.lst: disk/loopback.c genfslist.sh
-	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh loopback > $@ || (rm -f $@; exit 1)
-
-
-loopback_mod_CFLAGS = $(COMMON_CFLAGS)
-loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For default.mod
-default_mod_SOURCES = commands/default.c
-CLEANFILES += default.mod mod-default.o mod-default.c pre-default.o default_mod-commands_default.o def-default.lst und-default.lst
-MOSTLYCLEANFILES += default_mod-commands_default.d
-DEFSYMFILES += def-default.lst
-UNDSYMFILES += und-default.lst
-
-default.mod: pre-default.o mod-default.o
-	-rm -f $@
-	$(LD) $(default_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-default.o: default_mod-commands_default.o
-	-rm -f $@
-	$(LD) $(default_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-default.o: mod-default.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -c -o $@ $<
-
-mod-default.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'default' $< > $@ || (rm -f $@; exit 1)
-
-def-default.lst: pre-default.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 default/' > $@
-
-und-default.lst: pre-default.o
-	echo 'default' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-default_mod-commands_default.o: commands/default.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -c -o $@ $<
-
-default_mod-commands_default.d: commands/default.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -M $< 	  | sed 's,default\.o[ :]*,default_mod-commands_default.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include default_mod-commands_default.d
-
-CLEANFILES += cmd-default.lst fs-default.lst
-COMMANDFILES += cmd-default.lst
-FSFILES += fs-default.lst
-
-cmd-default.lst: commands/default.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh default > $@ || (rm -f $@; exit 1)
-
-fs-default.lst: commands/default.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh default > $@ || (rm -f $@; exit 1)
-
-
-default_mod_CFLAGS = $(COMMON_CFLAGS)
-default_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For timeout.mod
-timeout_mod_SOURCES = commands/timeout.c
-CLEANFILES += timeout.mod mod-timeout.o mod-timeout.c pre-timeout.o timeout_mod-commands_timeout.o def-timeout.lst und-timeout.lst
-MOSTLYCLEANFILES += timeout_mod-commands_timeout.d
-DEFSYMFILES += def-timeout.lst
-UNDSYMFILES += und-timeout.lst
-
-timeout.mod: pre-timeout.o mod-timeout.o
-	-rm -f $@
-	$(LD) $(timeout_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-timeout.o: timeout_mod-commands_timeout.o
-	-rm -f $@
-	$(LD) $(timeout_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-timeout.o: mod-timeout.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -c -o $@ $<
-
-mod-timeout.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'timeout' $< > $@ || (rm -f $@; exit 1)
-
-def-timeout.lst: pre-timeout.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 timeout/' > $@
-
-und-timeout.lst: pre-timeout.o
-	echo 'timeout' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-timeout_mod-commands_timeout.o: commands/timeout.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -c -o $@ $<
-
-timeout_mod-commands_timeout.d: commands/timeout.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -M $< 	  | sed 's,timeout\.o[ :]*,timeout_mod-commands_timeout.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include timeout_mod-commands_timeout.d
-
-CLEANFILES += cmd-timeout.lst fs-timeout.lst
-COMMANDFILES += cmd-timeout.lst
-FSFILES += fs-timeout.lst
-
-cmd-timeout.lst: commands/timeout.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh timeout > $@ || (rm -f $@; exit 1)
-
-fs-timeout.lst: commands/timeout.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh timeout > $@ || (rm -f $@; exit 1)
-
-
-timeout_mod_CFLAGS = $(COMMON_CFLAGS)
-timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For configfile.mod
-configfile_mod_SOURCES = commands/configfile.c
-CLEANFILES += configfile.mod mod-configfile.o mod-configfile.c pre-configfile.o configfile_mod-commands_configfile.o def-configfile.lst und-configfile.lst
-MOSTLYCLEANFILES += configfile_mod-commands_configfile.d
-DEFSYMFILES += def-configfile.lst
-UNDSYMFILES += und-configfile.lst
-
-configfile.mod: pre-configfile.o mod-configfile.o
-	-rm -f $@
-	$(LD) $(configfile_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-configfile.o: configfile_mod-commands_configfile.o
-	-rm -f $@
-	$(LD) $(configfile_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-configfile.o: mod-configfile.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -c -o $@ $<
-
-mod-configfile.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'configfile' $< > $@ || (rm -f $@; exit 1)
-
-def-configfile.lst: pre-configfile.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 configfile/' > $@
-
-und-configfile.lst: pre-configfile.o
-	echo 'configfile' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-configfile_mod-commands_configfile.o: commands/configfile.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -c -o $@ $<
-
-configfile_mod-commands_configfile.d: commands/configfile.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -M $< 	  | sed 's,configfile\.o[ :]*,configfile_mod-commands_configfile.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include configfile_mod-commands_configfile.d
-
-CLEANFILES += cmd-configfile.lst fs-configfile.lst
-COMMANDFILES += cmd-configfile.lst
-FSFILES += fs-configfile.lst
-
-cmd-configfile.lst: commands/configfile.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh configfile > $@ || (rm -f $@; exit 1)
-
-fs-configfile.lst: commands/configfile.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh configfile > $@ || (rm -f $@; exit 1)
-
-
-configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For vbe.mod.
 vbe_mod_SOURCES = video/i386/pc/vbe.c
 CLEANFILES += vbe.mod mod-vbe.o mod-vbe.c pre-vbe.o vbe_mod-video_i386_pc_vbe.o def-vbe.lst und-vbe.lst
@@ -3679,14 +2161,14 @@ vbe_mod-video_i386_pc_vbe.d: video/i386/pc/vbe.c
 
 -include vbe_mod-video_i386_pc_vbe.d
 
-CLEANFILES += cmd-vbe.lst fs-vbe.lst
-COMMANDFILES += cmd-vbe.lst
-FSFILES += fs-vbe.lst
+CLEANFILES += cmd-vbe_mod-video_i386_pc_vbe.lst fs-vbe_mod-video_i386_pc_vbe.lst
+COMMANDFILES += cmd-vbe_mod-video_i386_pc_vbe.lst
+FSFILES += fs-vbe_mod-video_i386_pc_vbe.lst
 
-cmd-vbe.lst: video/i386/pc/vbe.c gencmdlist.sh
+cmd-vbe_mod-video_i386_pc_vbe.lst: video/i386/pc/vbe.c gencmdlist.sh
 	set -e; 	  $(CC) -Ivideo/i386/pc -I$(srcdir)/video/i386/pc $(CPPFLAGS) $(CFLAGS) $(vbe_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh vbe > $@ || (rm -f $@; exit 1)
 
-fs-vbe.lst: video/i386/pc/vbe.c genfslist.sh
+fs-vbe_mod-video_i386_pc_vbe.lst: video/i386/pc/vbe.c genfslist.sh
 	set -e; 	  $(CC) -Ivideo/i386/pc -I$(srcdir)/video/i386/pc $(CPPFLAGS) $(CFLAGS) $(vbe_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh vbe > $@ || (rm -f $@; exit 1)
 
 
@@ -3730,14 +2212,14 @@ vesafb_mod-term_i386_pc_vesafb.d: term/i386/pc/vesafb.c
 
 -include vesafb_mod-term_i386_pc_vesafb.d
 
-CLEANFILES += cmd-vesafb.lst fs-vesafb.lst
-COMMANDFILES += cmd-vesafb.lst
-FSFILES += fs-vesafb.lst
+CLEANFILES += cmd-vesafb_mod-term_i386_pc_vesafb.lst fs-vesafb_mod-term_i386_pc_vesafb.lst
+COMMANDFILES += cmd-vesafb_mod-term_i386_pc_vesafb.lst
+FSFILES += fs-vesafb_mod-term_i386_pc_vesafb.lst
 
-cmd-vesafb.lst: term/i386/pc/vesafb.c gencmdlist.sh
+cmd-vesafb_mod-term_i386_pc_vesafb.lst: term/i386/pc/vesafb.c gencmdlist.sh
 	set -e; 	  $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vesafb_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh vesafb > $@ || (rm -f $@; exit 1)
 
-fs-vesafb.lst: term/i386/pc/vesafb.c genfslist.sh
+fs-vesafb_mod-term_i386_pc_vesafb.lst: term/i386/pc/vesafb.c genfslist.sh
 	set -e; 	  $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vesafb_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh vesafb > $@ || (rm -f $@; exit 1)
 
 
@@ -3781,14 +2263,14 @@ vbeinfo_mod-commands_i386_pc_vbeinfo.d: commands/i386/pc/vbeinfo.c
 
 -include vbeinfo_mod-commands_i386_pc_vbeinfo.d
 
-CLEANFILES += cmd-vbeinfo.lst fs-vbeinfo.lst
-COMMANDFILES += cmd-vbeinfo.lst
-FSFILES += fs-vbeinfo.lst
+CLEANFILES += cmd-vbeinfo_mod-commands_i386_pc_vbeinfo.lst fs-vbeinfo_mod-commands_i386_pc_vbeinfo.lst
+COMMANDFILES += cmd-vbeinfo_mod-commands_i386_pc_vbeinfo.lst
+FSFILES += fs-vbeinfo_mod-commands_i386_pc_vbeinfo.lst
 
-cmd-vbeinfo.lst: commands/i386/pc/vbeinfo.c gencmdlist.sh
+cmd-vbeinfo_mod-commands_i386_pc_vbeinfo.lst: commands/i386/pc/vbeinfo.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/i386/pc -I$(srcdir)/commands/i386/pc $(CPPFLAGS) $(CFLAGS) $(vbeinfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh vbeinfo > $@ || (rm -f $@; exit 1)
 
-fs-vbeinfo.lst: commands/i386/pc/vbeinfo.c genfslist.sh
+fs-vbeinfo_mod-commands_i386_pc_vbeinfo.lst: commands/i386/pc/vbeinfo.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/i386/pc -I$(srcdir)/commands/i386/pc $(CPPFLAGS) $(CFLAGS) $(vbeinfo_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh vbeinfo > $@ || (rm -f $@; exit 1)
 
 
@@ -3832,180 +2314,18 @@ vbetest_mod-commands_i386_pc_vbetest.d: commands/i386/pc/vbetest.c
 
 -include vbetest_mod-commands_i386_pc_vbetest.d
 
-CLEANFILES += cmd-vbetest.lst fs-vbetest.lst
-COMMANDFILES += cmd-vbetest.lst
-FSFILES += fs-vbetest.lst
+CLEANFILES += cmd-vbetest_mod-commands_i386_pc_vbetest.lst fs-vbetest_mod-commands_i386_pc_vbetest.lst
+COMMANDFILES += cmd-vbetest_mod-commands_i386_pc_vbetest.lst
+FSFILES += fs-vbetest_mod-commands_i386_pc_vbetest.lst
 
-cmd-vbetest.lst: commands/i386/pc/vbetest.c gencmdlist.sh
+cmd-vbetest_mod-commands_i386_pc_vbetest.lst: commands/i386/pc/vbetest.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/i386/pc -I$(srcdir)/commands/i386/pc $(CPPFLAGS) $(CFLAGS) $(vbetest_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh vbetest > $@ || (rm -f $@; exit 1)
 
-fs-vbetest.lst: commands/i386/pc/vbetest.c genfslist.sh
+fs-vbetest_mod-commands_i386_pc_vbetest.lst: commands/i386/pc/vbetest.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/i386/pc -I$(srcdir)/commands/i386/pc $(CPPFLAGS) $(CFLAGS) $(vbetest_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh vbetest > $@ || (rm -f $@; exit 1)
 
 
 vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
 vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For search.mod.
-search_mod_SOURCES = commands/search.c
-CLEANFILES += search.mod mod-search.o mod-search.c pre-search.o search_mod-commands_search.o def-search.lst und-search.lst
-MOSTLYCLEANFILES += search_mod-commands_search.d
-DEFSYMFILES += def-search.lst
-UNDSYMFILES += und-search.lst
-
-search.mod: pre-search.o mod-search.o
-	-rm -f $@
-	$(LD) $(search_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-search.o: search_mod-commands_search.o
-	-rm -f $@
-	$(LD) $(search_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-search.o: mod-search.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -c -o $@ $<
-
-mod-search.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'search' $< > $@ || (rm -f $@; exit 1)
-
-def-search.lst: pre-search.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 search/' > $@
-
-und-search.lst: pre-search.o
-	echo 'search' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-search_mod-commands_search.o: commands/search.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -c -o $@ $<
-
-search_mod-commands_search.d: commands/search.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -M $< 	  | sed 's,search\.o[ :]*,search_mod-commands_search.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include search_mod-commands_search.d
-
-CLEANFILES += cmd-search.lst fs-search.lst
-COMMANDFILES += cmd-search.lst
-FSFILES += fs-search.lst
-
-cmd-search.lst: commands/search.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh search > $@ || (rm -f $@; exit 1)
-
-fs-search.lst: commands/search.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh search > $@ || (rm -f $@; exit 1)
-
-
-search_mod_CFLAGS = $(COMMON_CFLAGS)
-search_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# 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) $(gzio_mod_LDFLAGS) $(LDFLAGS) -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) $(gzio_mod_LDFLAGS) -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)
-gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For test.mod.
-test_mod_SOURCES = commands/test.c
-CLEANFILES += test.mod mod-test.o mod-test.c pre-test.o test_mod-commands_test.o def-test.lst und-test.lst
-MOSTLYCLEANFILES += test_mod-commands_test.d
-DEFSYMFILES += def-test.lst
-UNDSYMFILES += und-test.lst
-
-test.mod: pre-test.o mod-test.o
-	-rm -f $@
-	$(LD) $(test_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
-
-pre-test.o: test_mod-commands_test.o
-	-rm -f $@
-	$(LD) $(test_mod_LDFLAGS) -r -d -o $@ $^
-
-mod-test.o: mod-test.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(test_mod_CFLAGS) -c -o $@ $<
-
-mod-test.c: moddep.lst genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh 'test' $< > $@ || (rm -f $@; exit 1)
-
-def-test.lst: pre-test.o
-	$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 test/' > $@
-
-und-test.lst: pre-test.o
-	echo 'test' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-test_mod-commands_test.o: commands/test.c
-	$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(test_mod_CFLAGS) -c -o $@ $<
-
-test_mod-commands_test.d: commands/test.c
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(test_mod_CFLAGS) -M $< 	  | sed 's,test\.o[ :]*,test_mod-commands_test.o $@ : ,g' > $@; 	  [ -s $@ ] || rm -f $@
-
--include test_mod-commands_test.d
-
-CLEANFILES += cmd-test.lst fs-test.lst
-COMMANDFILES += cmd-test.lst
-FSFILES += fs-test.lst
-
-cmd-test.lst: commands/test.c gencmdlist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(test_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh test > $@ || (rm -f $@; exit 1)
-
-fs-test.lst: commands/test.c genfslist.sh
-	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(test_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh test > $@ || (rm -f $@; exit 1)
-
-
-test_mod_CFLAGS = $(COMMON_CFLAGS)
-test_mod_LDFLAGS = $(COMMON_LDFLAGS)
-CLEANFILES += moddep.lst command.lst fs.lst
-pkgdata_DATA += moddep.lst command.lst fs.lst
-moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
-	cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
-	  || (rm -f $@; exit 1)
-
-command.lst: $(COMMANDFILES)
-	cat $^ /dev/null | sort > $@
-
-fs.lst: $(FSFILES)
-	cat $^ /dev/null | sort > $@
+include $(srcdir)/conf/common.mk
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index edf9a963e..ef971ad1c 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -46,11 +46,6 @@ DEFSYMFILES += kernel_syms.lst
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
 	sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
 
-# For the parser.
-grub_script.tab.c grub_script.tab.h: normal/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-
-
 kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) genkernsyms.sh
 	sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
 
@@ -107,15 +102,6 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c 		\
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-grub_modules_init.lst: geninit.sh
-	(cd $(srcdir); grep -r --include="*.c" GRUB_MOD_INIT *) > $@
-
-grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst
-	sh $(srcdir)/geninitheader.sh > $@
-
-grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h
-	sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
-
 # For genmoddep.
 genmoddep_SOURCES = util/genmoddep.c
 
@@ -126,15 +112,9 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/i386/pc/grub-install.in
 
 # Modules.
-pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod	\
-	ext2.mod minix.mod hfs.mod jfs.mod normal.mod hello.mod vga.mod	\
-	font.mod _multiboot.mod ls.mod boot.mod cmp.mod cat.mod		\
-	terminal.mod fshelp.mod chain.mod multiboot.mod amiga.mod	\
-	apple.mod pc.mod sun.mod loopback.mod reboot.mod halt.mod	\
-	help.mod default.mod timeout.mod configfile.mod vbe.mod		\
-	vesafb.mod vbetest.mod vbeinfo.mod search.mod gzio.mod		\
-	terminfo.mod serial.mod xfs.mod affs.mod sfs.mod test.mod	\
-	acorn.mod
+pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod vga.mod	\
+	_multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod	\
+	vbe.mod vesafb.mod vbetest.mod vbeinfo.mod
 
 # For _chain.mod.
 _chain_mod_SOURCES = loader/i386/pc/chainloader.c
@@ -146,61 +126,6 @@ chain_mod_SOURCES = loader/i386/pc/chainloader_normal.c
 chain_mod_CFLAGS = $(COMMON_CFLAGS)
 chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For fshelp.mod.
-fshelp_mod_SOURCES = fs/fshelp.c
-fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
-fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fat.mod.
-fat_mod_SOURCES = fs/fat.c
-fat_mod_CFLAGS = $(COMMON_CFLAGS)
-fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ext2.mod.
-ext2_mod_SOURCES = fs/ext2.c
-ext2_mod_CFLAGS = $(COMMON_CFLAGS)
-ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs.mod.
-ufs_mod_SOURCES = fs/ufs.c
-ufs_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minix.mod.
-minix_mod_SOURCES = fs/minix.c
-minix_mod_CFLAGS = $(COMMON_CFLAGS)
-minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfs.mod.
-hfs_mod_SOURCES = fs/hfs.c
-hfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jfs.mod.
-jfs_mod_SOURCES = fs/jfs.c
-jfs_mod_CFLAGS = $(COMMON_CFLAGS)
-jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For iso9660.mod.
-iso9660_mod_SOURCES = fs/iso9660.c
-iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
-iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For xfs.mod.
-xfs_mod_SOURCES = fs/xfs.c
-xfs_mod_CFLAGS = $(COMMON_CFLAGS)
-xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For affs.mod.
-affs_mod_SOURCES = fs/affs.c
-affs_mod_CFLAGS = $(COMMON_CFLAGS)
-affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sfs.mod.
-sfs_mod_SOURCES = fs/sfs.c
-sfs_mod_CFLAGS = $(COMMON_CFLAGS)
-sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For _linux.mod.
 _linux_mod_SOURCES = loader/i386/pc/linux.c
 _linux_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -221,41 +146,6 @@ normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_ASFLAGS = $(COMMON_ASFLAGS) -m32
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For hello.mod.
-hello_mod_SOURCES = hello/hello.c
-hello_mod_CFLAGS = $(COMMON_CFLAGS)
-hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For boot.mod.
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminal.mod.
-terminal_mod_SOURCES = commands/terminal.c
-terminal_mod_CFLAGS = $(COMMON_CFLAGS)
-terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ls.mod.
-ls_mod_SOURCES = commands/ls.c
-ls_mod_CFLAGS = $(COMMON_CFLAGS)
-ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmp.mod.
-cmp_mod_SOURCES = commands/cmp.c
-cmp_mod_CFLAGS = $(COMMON_CFLAGS)
-cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cat.mod.
-cat_mod_SOURCES = commands/cat.c
-cat_mod_CFLAGS = $(COMMON_CFLAGS)
-cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For help.mod.
-help_mod_SOURCES = commands/help.c
-help_mod_CFLAGS = $(COMMON_CFLAGS)
-help_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For reboot.mod.
 reboot_mod_SOURCES = commands/i386/pc/reboot.c
 reboot_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -271,16 +161,6 @@ vga_mod_SOURCES = term/i386/pc/vga.c
 vga_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For font.mod.
-font_mod_SOURCES = font/manager.c
-font_mod_CFLAGS = $(COMMON_CFLAGS)
-font_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For terminfo.mod.
-terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
-terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
-terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For serial.mod.
 serial_mod_SOURCES = term/i386/pc/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -296,51 +176,6 @@ multiboot_mod_SOURCES = loader/i386/pc/multiboot_normal.c
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For amiga.mod
-amiga_mod_SOURCES = partmap/amiga.c
-amiga_mod_CFLAGS = $(COMMON_CFLAGS)
-amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For apple.mod
-apple_mod_SOURCES = partmap/apple.c
-apple_mod_CFLAGS = $(COMMON_CFLAGS)
-apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pc.mod
-pc_mod_SOURCES = partmap/pc.c
-pc_mod_CFLAGS = $(COMMON_CFLAGS)
-pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sun.mod
-sun_mod_SOURCES = partmap/sun.c
-sun_mod_CFLAGS = $(COMMON_CFLAGS)
-sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acorn.mod
-acorn_mod_SOURCES = partmap/acorn.c
-acorn_mod_CFLAGS = $(COMMON_CFLAGS)
-acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loopback.mod
-loopback_mod_SOURCES = disk/loopback.c
-loopback_mod_CFLAGS = $(COMMON_CFLAGS)
-loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For default.mod
-default_mod_SOURCES = commands/default.c
-default_mod_CFLAGS = $(COMMON_CFLAGS)
-default_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For timeout.mod
-timeout_mod_SOURCES = commands/timeout.c
-timeout_mod_CFLAGS = $(COMMON_CFLAGS)
-timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For configfile.mod
-configfile_mod_SOURCES = commands/configfile.c
-configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For vbe.mod.
 vbe_mod_SOURCES = video/i386/pc/vbe.c
 vbe_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -361,17 +196,4 @@ vbetest_mod_SOURCES = commands/i386/pc/vbetest.c
 vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
 vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For search.mod.
-search_mod_SOURCES = commands/search.c
-search_mod_CFLAGS = $(COMMON_CFLAGS)
-search_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gzio.mod.
-gzio_mod_SOURCES = io/gzio.c
-gzio_mod_CFLAGS = $(COMMON_CFLAGS)
-gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For test.mod.
-test_mod_SOURCES = commands/test.c
-test_mod_CFLAGS = $(COMMON_CFLAGS)
-test_mod_LDFLAGS = $(COMMON_LDFLAGS)
+include $(srcdir)/conf/common.mk
diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index 9c581540b..e444d7dad 100644
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -928,14 +928,14 @@ fshelp_mod-fs_fshelp.d: fs/fshelp.c
 
 -include fshelp_mod-fs_fshelp.d
 
-CLEANFILES += cmd-fshelp.lst fs-fshelp.lst
-COMMANDFILES += cmd-fshelp.lst
-FSFILES += fs-fshelp.lst
+CLEANFILES += cmd-fshelp_mod-fs_fshelp.lst fs-fshelp_mod-fs_fshelp.lst
+COMMANDFILES += cmd-fshelp_mod-fs_fshelp.lst
+FSFILES += fs-fshelp_mod-fs_fshelp.lst
 
-cmd-fshelp.lst: fs/fshelp.c gencmdlist.sh
+cmd-fshelp_mod-fs_fshelp.lst: fs/fshelp.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh fshelp > $@ || (rm -f $@; exit 1)
 
-fs-fshelp.lst: fs/fshelp.c genfslist.sh
+fs-fshelp_mod-fs_fshelp.lst: fs/fshelp.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh fshelp > $@ || (rm -f $@; exit 1)
 
 
@@ -978,14 +978,14 @@ fat_mod-fs_fat.d: fs/fat.c
 
 -include fat_mod-fs_fat.d
 
-CLEANFILES += cmd-fat.lst fs-fat.lst
-COMMANDFILES += cmd-fat.lst
-FSFILES += fs-fat.lst
+CLEANFILES += cmd-fat_mod-fs_fat.lst fs-fat_mod-fs_fat.lst
+COMMANDFILES += cmd-fat_mod-fs_fat.lst
+FSFILES += fs-fat_mod-fs_fat.lst
 
-cmd-fat.lst: fs/fat.c gencmdlist.sh
+cmd-fat_mod-fs_fat.lst: fs/fat.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh fat > $@ || (rm -f $@; exit 1)
 
-fs-fat.lst: fs/fat.c genfslist.sh
+fs-fat_mod-fs_fat.lst: fs/fat.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh fat > $@ || (rm -f $@; exit 1)
 
 
@@ -1028,14 +1028,14 @@ ext2_mod-fs_ext2.d: fs/ext2.c
 
 -include ext2_mod-fs_ext2.d
 
-CLEANFILES += cmd-ext2.lst fs-ext2.lst
-COMMANDFILES += cmd-ext2.lst
-FSFILES += fs-ext2.lst
+CLEANFILES += cmd-ext2_mod-fs_ext2.lst fs-ext2_mod-fs_ext2.lst
+COMMANDFILES += cmd-ext2_mod-fs_ext2.lst
+FSFILES += fs-ext2_mod-fs_ext2.lst
 
-cmd-ext2.lst: fs/ext2.c gencmdlist.sh
+cmd-ext2_mod-fs_ext2.lst: fs/ext2.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ext2 > $@ || (rm -f $@; exit 1)
 
-fs-ext2.lst: fs/ext2.c genfslist.sh
+fs-ext2_mod-fs_ext2.lst: fs/ext2.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ext2 > $@ || (rm -f $@; exit 1)
 
 
@@ -1078,14 +1078,14 @@ ufs_mod-fs_ufs.d: fs/ufs.c
 
 -include ufs_mod-fs_ufs.d
 
-CLEANFILES += cmd-ufs.lst fs-ufs.lst
-COMMANDFILES += cmd-ufs.lst
-FSFILES += fs-ufs.lst
+CLEANFILES += cmd-ufs_mod-fs_ufs.lst fs-ufs_mod-fs_ufs.lst
+COMMANDFILES += cmd-ufs_mod-fs_ufs.lst
+FSFILES += fs-ufs_mod-fs_ufs.lst
 
-cmd-ufs.lst: fs/ufs.c gencmdlist.sh
+cmd-ufs_mod-fs_ufs.lst: fs/ufs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ufs > $@ || (rm -f $@; exit 1)
 
-fs-ufs.lst: fs/ufs.c genfslist.sh
+fs-ufs_mod-fs_ufs.lst: fs/ufs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ufs > $@ || (rm -f $@; exit 1)
 
 
@@ -1128,14 +1128,14 @@ minix_mod-fs_minix.d: fs/minix.c
 
 -include minix_mod-fs_minix.d
 
-CLEANFILES += cmd-minix.lst fs-minix.lst
-COMMANDFILES += cmd-minix.lst
-FSFILES += fs-minix.lst
+CLEANFILES += cmd-minix_mod-fs_minix.lst fs-minix_mod-fs_minix.lst
+COMMANDFILES += cmd-minix_mod-fs_minix.lst
+FSFILES += fs-minix_mod-fs_minix.lst
 
-cmd-minix.lst: fs/minix.c gencmdlist.sh
+cmd-minix_mod-fs_minix.lst: fs/minix.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh minix > $@ || (rm -f $@; exit 1)
 
-fs-minix.lst: fs/minix.c genfslist.sh
+fs-minix_mod-fs_minix.lst: fs/minix.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh minix > $@ || (rm -f $@; exit 1)
 
 
@@ -1178,14 +1178,14 @@ hfs_mod-fs_hfs.d: fs/hfs.c
 
 -include hfs_mod-fs_hfs.d
 
-CLEANFILES += cmd-hfs.lst fs-hfs.lst
-COMMANDFILES += cmd-hfs.lst
-FSFILES += fs-hfs.lst
+CLEANFILES += cmd-hfs_mod-fs_hfs.lst fs-hfs_mod-fs_hfs.lst
+COMMANDFILES += cmd-hfs_mod-fs_hfs.lst
+FSFILES += fs-hfs_mod-fs_hfs.lst
 
-cmd-hfs.lst: fs/hfs.c gencmdlist.sh
+cmd-hfs_mod-fs_hfs.lst: fs/hfs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh hfs > $@ || (rm -f $@; exit 1)
 
-fs-hfs.lst: fs/hfs.c genfslist.sh
+fs-hfs_mod-fs_hfs.lst: fs/hfs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh hfs > $@ || (rm -f $@; exit 1)
 
 
@@ -1228,14 +1228,14 @@ jfs_mod-fs_jfs.d: fs/jfs.c
 
 -include jfs_mod-fs_jfs.d
 
-CLEANFILES += cmd-jfs.lst fs-jfs.lst
-COMMANDFILES += cmd-jfs.lst
-FSFILES += fs-jfs.lst
+CLEANFILES += cmd-jfs_mod-fs_jfs.lst fs-jfs_mod-fs_jfs.lst
+COMMANDFILES += cmd-jfs_mod-fs_jfs.lst
+FSFILES += fs-jfs_mod-fs_jfs.lst
 
-cmd-jfs.lst: fs/jfs.c gencmdlist.sh
+cmd-jfs_mod-fs_jfs.lst: fs/jfs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh jfs > $@ || (rm -f $@; exit 1)
 
-fs-jfs.lst: fs/jfs.c genfslist.sh
+fs-jfs_mod-fs_jfs.lst: fs/jfs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh jfs > $@ || (rm -f $@; exit 1)
 
 
@@ -1282,14 +1282,14 @@ xfs_mod-fs_xfs.d: fs/xfs.c
 
 -include xfs_mod-fs_xfs.d
 
-CLEANFILES += cmd-xfs.lst fs-xfs.lst
-COMMANDFILES += cmd-xfs.lst
-FSFILES += fs-xfs.lst
+CLEANFILES += cmd-xfs_mod-fs_xfs.lst fs-xfs_mod-fs_xfs.lst
+COMMANDFILES += cmd-xfs_mod-fs_xfs.lst
+FSFILES += fs-xfs_mod-fs_xfs.lst
 
-cmd-xfs.lst: fs/xfs.c gencmdlist.sh
+cmd-xfs_mod-fs_xfs.lst: fs/xfs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh xfs > $@ || (rm -f $@; exit 1)
 
-fs-xfs.lst: fs/xfs.c genfslist.sh
+fs-xfs_mod-fs_xfs.lst: fs/xfs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh xfs > $@ || (rm -f $@; exit 1)
 
 
@@ -1332,14 +1332,14 @@ affs_mod-fs_affs.d: fs/affs.c
 
 -include affs_mod-fs_affs.d
 
-CLEANFILES += cmd-affs.lst fs-affs.lst
-COMMANDFILES += cmd-affs.lst
-FSFILES += fs-affs.lst
+CLEANFILES += cmd-affs_mod-fs_affs.lst fs-affs_mod-fs_affs.lst
+COMMANDFILES += cmd-affs_mod-fs_affs.lst
+FSFILES += fs-affs_mod-fs_affs.lst
 
-cmd-affs.lst: fs/affs.c gencmdlist.sh
+cmd-affs_mod-fs_affs.lst: fs/affs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh affs > $@ || (rm -f $@; exit 1)
 
-fs-affs.lst: fs/affs.c genfslist.sh
+fs-affs_mod-fs_affs.lst: fs/affs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh affs > $@ || (rm -f $@; exit 1)
 
 
@@ -1382,14 +1382,14 @@ sfs_mod-fs_sfs.d: fs/sfs.c
 
 -include sfs_mod-fs_sfs.d
 
-CLEANFILES += cmd-sfs.lst fs-sfs.lst
-COMMANDFILES += cmd-sfs.lst
-FSFILES += fs-sfs.lst
+CLEANFILES += cmd-sfs_mod-fs_sfs.lst fs-sfs_mod-fs_sfs.lst
+COMMANDFILES += cmd-sfs_mod-fs_sfs.lst
+FSFILES += fs-sfs_mod-fs_sfs.lst
 
-cmd-sfs.lst: fs/sfs.c gencmdlist.sh
+cmd-sfs_mod-fs_sfs.lst: fs/sfs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh sfs > $@ || (rm -f $@; exit 1)
 
-fs-sfs.lst: fs/sfs.c genfslist.sh
+fs-sfs_mod-fs_sfs.lst: fs/sfs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh sfs > $@ || (rm -f $@; exit 1)
 
 
@@ -1432,14 +1432,14 @@ _linux_mod-loader_powerpc_ieee1275_linux.d: loader/powerpc/ieee1275/linux.c
 
 -include _linux_mod-loader_powerpc_ieee1275_linux.d
 
-CLEANFILES += cmd-linux.lst fs-linux.lst
-COMMANDFILES += cmd-linux.lst
-FSFILES += fs-linux.lst
+CLEANFILES += cmd-_linux_mod-loader_powerpc_ieee1275_linux.lst fs-_linux_mod-loader_powerpc_ieee1275_linux.lst
+COMMANDFILES += cmd-_linux_mod-loader_powerpc_ieee1275_linux.lst
+FSFILES += fs-_linux_mod-loader_powerpc_ieee1275_linux.lst
 
-cmd-linux.lst: loader/powerpc/ieee1275/linux.c gencmdlist.sh
+cmd-_linux_mod-loader_powerpc_ieee1275_linux.lst: loader/powerpc/ieee1275/linux.c gencmdlist.sh
 	set -e; 	  $(CC) -Iloader/powerpc/ieee1275 -I$(srcdir)/loader/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(_linux_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh _linux > $@ || (rm -f $@; exit 1)
 
-fs-linux.lst: loader/powerpc/ieee1275/linux.c genfslist.sh
+fs-_linux_mod-loader_powerpc_ieee1275_linux.lst: loader/powerpc/ieee1275/linux.c genfslist.sh
 	set -e; 	  $(CC) -Iloader/powerpc/ieee1275 -I$(srcdir)/loader/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(_linux_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh _linux > $@ || (rm -f $@; exit 1)
 
 
@@ -1482,14 +1482,14 @@ linux_mod-loader_powerpc_ieee1275_linux_normal.d: loader/powerpc/ieee1275/linux_
 
 -include linux_mod-loader_powerpc_ieee1275_linux_normal.d
 
-CLEANFILES += cmd-linux_normal.lst fs-linux_normal.lst
-COMMANDFILES += cmd-linux_normal.lst
-FSFILES += fs-linux_normal.lst
+CLEANFILES += cmd-linux_mod-loader_powerpc_ieee1275_linux_normal.lst fs-linux_mod-loader_powerpc_ieee1275_linux_normal.lst
+COMMANDFILES += cmd-linux_mod-loader_powerpc_ieee1275_linux_normal.lst
+FSFILES += fs-linux_mod-loader_powerpc_ieee1275_linux_normal.lst
 
-cmd-linux_normal.lst: loader/powerpc/ieee1275/linux_normal.c gencmdlist.sh
+cmd-linux_mod-loader_powerpc_ieee1275_linux_normal.lst: loader/powerpc/ieee1275/linux_normal.c gencmdlist.sh
 	set -e; 	  $(CC) -Iloader/powerpc/ieee1275 -I$(srcdir)/loader/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(linux_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh linux > $@ || (rm -f $@; exit 1)
 
-fs-linux_normal.lst: loader/powerpc/ieee1275/linux_normal.c genfslist.sh
+fs-linux_mod-loader_powerpc_ieee1275_linux_normal.lst: loader/powerpc/ieee1275/linux_normal.c genfslist.sh
 	set -e; 	  $(CC) -Iloader/powerpc/ieee1275 -I$(srcdir)/loader/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(linux_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh linux > $@ || (rm -f $@; exit 1)
 
 
@@ -1536,14 +1536,14 @@ normal_mod-normal_arg.d: normal/arg.c
 
 -include normal_mod-normal_arg.d
 
-CLEANFILES += cmd-arg.lst fs-arg.lst
-COMMANDFILES += cmd-arg.lst
-FSFILES += fs-arg.lst
+CLEANFILES += cmd-normal_mod-normal_arg.lst fs-normal_mod-normal_arg.lst
+COMMANDFILES += cmd-normal_mod-normal_arg.lst
+FSFILES += fs-normal_mod-normal_arg.lst
 
-cmd-arg.lst: normal/arg.c gencmdlist.sh
+cmd-normal_mod-normal_arg.lst: normal/arg.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-arg.lst: normal/arg.c genfslist.sh
+fs-normal_mod-normal_arg.lst: normal/arg.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1555,14 +1555,14 @@ normal_mod-normal_cmdline.d: normal/cmdline.c
 
 -include normal_mod-normal_cmdline.d
 
-CLEANFILES += cmd-cmdline.lst fs-cmdline.lst
-COMMANDFILES += cmd-cmdline.lst
-FSFILES += fs-cmdline.lst
+CLEANFILES += cmd-normal_mod-normal_cmdline.lst fs-normal_mod-normal_cmdline.lst
+COMMANDFILES += cmd-normal_mod-normal_cmdline.lst
+FSFILES += fs-normal_mod-normal_cmdline.lst
 
-cmd-cmdline.lst: normal/cmdline.c gencmdlist.sh
+cmd-normal_mod-normal_cmdline.lst: normal/cmdline.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-cmdline.lst: normal/cmdline.c genfslist.sh
+fs-normal_mod-normal_cmdline.lst: normal/cmdline.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1574,14 +1574,14 @@ normal_mod-normal_command.d: normal/command.c
 
 -include normal_mod-normal_command.d
 
-CLEANFILES += cmd-command.lst fs-command.lst
-COMMANDFILES += cmd-command.lst
-FSFILES += fs-command.lst
+CLEANFILES += cmd-normal_mod-normal_command.lst fs-normal_mod-normal_command.lst
+COMMANDFILES += cmd-normal_mod-normal_command.lst
+FSFILES += fs-normal_mod-normal_command.lst
 
-cmd-command.lst: normal/command.c gencmdlist.sh
+cmd-normal_mod-normal_command.lst: normal/command.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-command.lst: normal/command.c genfslist.sh
+fs-normal_mod-normal_command.lst: normal/command.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1593,14 +1593,14 @@ normal_mod-normal_completion.d: normal/completion.c
 
 -include normal_mod-normal_completion.d
 
-CLEANFILES += cmd-completion.lst fs-completion.lst
-COMMANDFILES += cmd-completion.lst
-FSFILES += fs-completion.lst
+CLEANFILES += cmd-normal_mod-normal_completion.lst fs-normal_mod-normal_completion.lst
+COMMANDFILES += cmd-normal_mod-normal_completion.lst
+FSFILES += fs-normal_mod-normal_completion.lst
 
-cmd-completion.lst: normal/completion.c gencmdlist.sh
+cmd-normal_mod-normal_completion.lst: normal/completion.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-completion.lst: normal/completion.c genfslist.sh
+fs-normal_mod-normal_completion.lst: normal/completion.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1612,14 +1612,14 @@ normal_mod-normal_context.d: normal/context.c
 
 -include normal_mod-normal_context.d
 
-CLEANFILES += cmd-context.lst fs-context.lst
-COMMANDFILES += cmd-context.lst
-FSFILES += fs-context.lst
+CLEANFILES += cmd-normal_mod-normal_context.lst fs-normal_mod-normal_context.lst
+COMMANDFILES += cmd-normal_mod-normal_context.lst
+FSFILES += fs-normal_mod-normal_context.lst
 
-cmd-context.lst: normal/context.c gencmdlist.sh
+cmd-normal_mod-normal_context.lst: normal/context.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-context.lst: normal/context.c genfslist.sh
+fs-normal_mod-normal_context.lst: normal/context.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1631,14 +1631,14 @@ normal_mod-normal_execute.d: normal/execute.c
 
 -include normal_mod-normal_execute.d
 
-CLEANFILES += cmd-execute.lst fs-execute.lst
-COMMANDFILES += cmd-execute.lst
-FSFILES += fs-execute.lst
+CLEANFILES += cmd-normal_mod-normal_execute.lst fs-normal_mod-normal_execute.lst
+COMMANDFILES += cmd-normal_mod-normal_execute.lst
+FSFILES += fs-normal_mod-normal_execute.lst
 
-cmd-execute.lst: normal/execute.c gencmdlist.sh
+cmd-normal_mod-normal_execute.lst: normal/execute.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-execute.lst: normal/execute.c genfslist.sh
+fs-normal_mod-normal_execute.lst: normal/execute.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1650,14 +1650,14 @@ normal_mod-normal_function.d: normal/function.c
 
 -include normal_mod-normal_function.d
 
-CLEANFILES += cmd-function.lst fs-function.lst
-COMMANDFILES += cmd-function.lst
-FSFILES += fs-function.lst
+CLEANFILES += cmd-normal_mod-normal_function.lst fs-normal_mod-normal_function.lst
+COMMANDFILES += cmd-normal_mod-normal_function.lst
+FSFILES += fs-normal_mod-normal_function.lst
 
-cmd-function.lst: normal/function.c gencmdlist.sh
+cmd-normal_mod-normal_function.lst: normal/function.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-function.lst: normal/function.c genfslist.sh
+fs-normal_mod-normal_function.lst: normal/function.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1669,14 +1669,14 @@ normal_mod-normal_lexer.d: normal/lexer.c
 
 -include normal_mod-normal_lexer.d
 
-CLEANFILES += cmd-lexer.lst fs-lexer.lst
-COMMANDFILES += cmd-lexer.lst
-FSFILES += fs-lexer.lst
+CLEANFILES += cmd-normal_mod-normal_lexer.lst fs-normal_mod-normal_lexer.lst
+COMMANDFILES += cmd-normal_mod-normal_lexer.lst
+FSFILES += fs-normal_mod-normal_lexer.lst
 
-cmd-lexer.lst: normal/lexer.c gencmdlist.sh
+cmd-normal_mod-normal_lexer.lst: normal/lexer.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-lexer.lst: normal/lexer.c genfslist.sh
+fs-normal_mod-normal_lexer.lst: normal/lexer.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1688,14 +1688,14 @@ normal_mod-normal_main.d: normal/main.c
 
 -include normal_mod-normal_main.d
 
-CLEANFILES += cmd-main.lst fs-main.lst
-COMMANDFILES += cmd-main.lst
-FSFILES += fs-main.lst
+CLEANFILES += cmd-normal_mod-normal_main.lst fs-normal_mod-normal_main.lst
+COMMANDFILES += cmd-normal_mod-normal_main.lst
+FSFILES += fs-normal_mod-normal_main.lst
 
-cmd-main.lst: normal/main.c gencmdlist.sh
+cmd-normal_mod-normal_main.lst: normal/main.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-main.lst: normal/main.c genfslist.sh
+fs-normal_mod-normal_main.lst: normal/main.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1707,14 +1707,14 @@ normal_mod-normal_menu.d: normal/menu.c
 
 -include normal_mod-normal_menu.d
 
-CLEANFILES += cmd-menu.lst fs-menu.lst
-COMMANDFILES += cmd-menu.lst
-FSFILES += fs-menu.lst
+CLEANFILES += cmd-normal_mod-normal_menu.lst fs-normal_mod-normal_menu.lst
+COMMANDFILES += cmd-normal_mod-normal_menu.lst
+FSFILES += fs-normal_mod-normal_menu.lst
 
-cmd-menu.lst: normal/menu.c gencmdlist.sh
+cmd-normal_mod-normal_menu.lst: normal/menu.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-menu.lst: normal/menu.c genfslist.sh
+fs-normal_mod-normal_menu.lst: normal/menu.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1726,14 +1726,14 @@ normal_mod-normal_menu_entry.d: normal/menu_entry.c
 
 -include normal_mod-normal_menu_entry.d
 
-CLEANFILES += cmd-menu_entry.lst fs-menu_entry.lst
-COMMANDFILES += cmd-menu_entry.lst
-FSFILES += fs-menu_entry.lst
+CLEANFILES += cmd-normal_mod-normal_menu_entry.lst fs-normal_mod-normal_menu_entry.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_entry.lst
+FSFILES += fs-normal_mod-normal_menu_entry.lst
 
-cmd-menu_entry.lst: normal/menu_entry.c gencmdlist.sh
+cmd-normal_mod-normal_menu_entry.lst: normal/menu_entry.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-menu_entry.lst: normal/menu_entry.c genfslist.sh
+fs-normal_mod-normal_menu_entry.lst: normal/menu_entry.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1745,14 +1745,14 @@ normal_mod-normal_misc.d: normal/misc.c
 
 -include normal_mod-normal_misc.d
 
-CLEANFILES += cmd-misc.lst fs-misc.lst
-COMMANDFILES += cmd-misc.lst
-FSFILES += fs-misc.lst
+CLEANFILES += cmd-normal_mod-normal_misc.lst fs-normal_mod-normal_misc.lst
+COMMANDFILES += cmd-normal_mod-normal_misc.lst
+FSFILES += fs-normal_mod-normal_misc.lst
 
-cmd-misc.lst: normal/misc.c gencmdlist.sh
+cmd-normal_mod-normal_misc.lst: normal/misc.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-misc.lst: normal/misc.c genfslist.sh
+fs-normal_mod-normal_misc.lst: normal/misc.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1764,14 +1764,14 @@ normal_mod-grub_script_tab.d: grub_script.tab.c
 
 -include normal_mod-grub_script_tab.d
 
-CLEANFILES += cmd-grub_script.tab.lst fs-grub_script.tab.lst
-COMMANDFILES += cmd-grub_script.tab.lst
-FSFILES += fs-grub_script.tab.lst
+CLEANFILES += cmd-normal_mod-grub_script_tab.lst fs-normal_mod-grub_script_tab.lst
+COMMANDFILES += cmd-normal_mod-grub_script_tab.lst
+FSFILES += fs-normal_mod-grub_script_tab.lst
 
-cmd-grub_script.tab.lst: grub_script.tab.c gencmdlist.sh
+cmd-normal_mod-grub_script_tab.lst: grub_script.tab.c gencmdlist.sh
 	set -e; 	  $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-grub_script.tab.lst: grub_script.tab.c genfslist.sh
+fs-normal_mod-grub_script_tab.lst: grub_script.tab.c genfslist.sh
 	set -e; 	  $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1783,14 +1783,14 @@ normal_mod-normal_script.d: normal/script.c
 
 -include normal_mod-normal_script.d
 
-CLEANFILES += cmd-script.lst fs-script.lst
-COMMANDFILES += cmd-script.lst
-FSFILES += fs-script.lst
+CLEANFILES += cmd-normal_mod-normal_script.lst fs-normal_mod-normal_script.lst
+COMMANDFILES += cmd-normal_mod-normal_script.lst
+FSFILES += fs-normal_mod-normal_script.lst
 
-cmd-script.lst: normal/script.c gencmdlist.sh
+cmd-normal_mod-normal_script.lst: normal/script.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-script.lst: normal/script.c genfslist.sh
+fs-normal_mod-normal_script.lst: normal/script.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1802,14 +1802,14 @@ normal_mod-normal_powerpc_setjmp.d: normal/powerpc/setjmp.S
 
 -include normal_mod-normal_powerpc_setjmp.d
 
-CLEANFILES += cmd-setjmp.lst fs-setjmp.lst
-COMMANDFILES += cmd-setjmp.lst
-FSFILES += fs-setjmp.lst
+CLEANFILES += cmd-normal_mod-normal_powerpc_setjmp.lst fs-normal_mod-normal_powerpc_setjmp.lst
+COMMANDFILES += cmd-normal_mod-normal_powerpc_setjmp.lst
+FSFILES += fs-normal_mod-normal_powerpc_setjmp.lst
 
-cmd-setjmp.lst: normal/powerpc/setjmp.S gencmdlist.sh
+cmd-normal_mod-normal_powerpc_setjmp.lst: normal/powerpc/setjmp.S gencmdlist.sh
 	set -e; 	  $(CC) -Inormal/powerpc -I$(srcdir)/normal/powerpc $(CPPFLAGS) $(ASFLAGS) $(normal_mod_ASFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-setjmp.lst: normal/powerpc/setjmp.S genfslist.sh
+fs-normal_mod-normal_powerpc_setjmp.lst: normal/powerpc/setjmp.S genfslist.sh
 	set -e; 	  $(CC) -Inormal/powerpc -I$(srcdir)/normal/powerpc $(CPPFLAGS) $(ASFLAGS) $(normal_mod_ASFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1853,14 +1853,14 @@ hello_mod-hello_hello.d: hello/hello.c
 
 -include hello_mod-hello_hello.d
 
-CLEANFILES += cmd-hello.lst fs-hello.lst
-COMMANDFILES += cmd-hello.lst
-FSFILES += fs-hello.lst
+CLEANFILES += cmd-hello_mod-hello_hello.lst fs-hello_mod-hello_hello.lst
+COMMANDFILES += cmd-hello_mod-hello_hello.lst
+FSFILES += fs-hello_mod-hello_hello.lst
 
-cmd-hello.lst: hello/hello.c gencmdlist.sh
+cmd-hello_mod-hello_hello.lst: hello/hello.c gencmdlist.sh
 	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh hello > $@ || (rm -f $@; exit 1)
 
-fs-hello.lst: hello/hello.c genfslist.sh
+fs-hello_mod-hello_hello.lst: hello/hello.c genfslist.sh
 	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh hello > $@ || (rm -f $@; exit 1)
 
 
@@ -1903,14 +1903,14 @@ boot_mod-commands_boot.d: commands/boot.c
 
 -include boot_mod-commands_boot.d
 
-CLEANFILES += cmd-boot.lst fs-boot.lst
-COMMANDFILES += cmd-boot.lst
-FSFILES += fs-boot.lst
+CLEANFILES += cmd-boot_mod-commands_boot.lst fs-boot_mod-commands_boot.lst
+COMMANDFILES += cmd-boot_mod-commands_boot.lst
+FSFILES += fs-boot_mod-commands_boot.lst
 
-cmd-boot.lst: commands/boot.c gencmdlist.sh
+cmd-boot_mod-commands_boot.lst: commands/boot.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh boot > $@ || (rm -f $@; exit 1)
 
-fs-boot.lst: commands/boot.c genfslist.sh
+fs-boot_mod-commands_boot.lst: commands/boot.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh boot > $@ || (rm -f $@; exit 1)
 
 
@@ -1953,14 +1953,14 @@ terminal_mod-commands_terminal.d: commands/terminal.c
 
 -include terminal_mod-commands_terminal.d
 
-CLEANFILES += cmd-terminal.lst fs-terminal.lst
-COMMANDFILES += cmd-terminal.lst
-FSFILES += fs-terminal.lst
+CLEANFILES += cmd-terminal_mod-commands_terminal.lst fs-terminal_mod-commands_terminal.lst
+COMMANDFILES += cmd-terminal_mod-commands_terminal.lst
+FSFILES += fs-terminal_mod-commands_terminal.lst
 
-cmd-terminal.lst: commands/terminal.c gencmdlist.sh
+cmd-terminal_mod-commands_terminal.lst: commands/terminal.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh terminal > $@ || (rm -f $@; exit 1)
 
-fs-terminal.lst: commands/terminal.c genfslist.sh
+fs-terminal_mod-commands_terminal.lst: commands/terminal.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh terminal > $@ || (rm -f $@; exit 1)
 
 
@@ -2003,14 +2003,14 @@ ls_mod-commands_ls.d: commands/ls.c
 
 -include ls_mod-commands_ls.d
 
-CLEANFILES += cmd-ls.lst fs-ls.lst
-COMMANDFILES += cmd-ls.lst
-FSFILES += fs-ls.lst
+CLEANFILES += cmd-ls_mod-commands_ls.lst fs-ls_mod-commands_ls.lst
+COMMANDFILES += cmd-ls_mod-commands_ls.lst
+FSFILES += fs-ls_mod-commands_ls.lst
 
-cmd-ls.lst: commands/ls.c gencmdlist.sh
+cmd-ls_mod-commands_ls.lst: commands/ls.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ls > $@ || (rm -f $@; exit 1)
 
-fs-ls.lst: commands/ls.c genfslist.sh
+fs-ls_mod-commands_ls.lst: commands/ls.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ls > $@ || (rm -f $@; exit 1)
 
 
@@ -2053,14 +2053,14 @@ cmp_mod-commands_cmp.d: commands/cmp.c
 
 -include cmp_mod-commands_cmp.d
 
-CLEANFILES += cmd-cmp.lst fs-cmp.lst
-COMMANDFILES += cmd-cmp.lst
-FSFILES += fs-cmp.lst
+CLEANFILES += cmd-cmp_mod-commands_cmp.lst fs-cmp_mod-commands_cmp.lst
+COMMANDFILES += cmd-cmp_mod-commands_cmp.lst
+FSFILES += fs-cmp_mod-commands_cmp.lst
 
-cmd-cmp.lst: commands/cmp.c gencmdlist.sh
+cmd-cmp_mod-commands_cmp.lst: commands/cmp.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh cmp > $@ || (rm -f $@; exit 1)
 
-fs-cmp.lst: commands/cmp.c genfslist.sh
+fs-cmp_mod-commands_cmp.lst: commands/cmp.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh cmp > $@ || (rm -f $@; exit 1)
 
 
@@ -2103,14 +2103,14 @@ cat_mod-commands_cat.d: commands/cat.c
 
 -include cat_mod-commands_cat.d
 
-CLEANFILES += cmd-cat.lst fs-cat.lst
-COMMANDFILES += cmd-cat.lst
-FSFILES += fs-cat.lst
+CLEANFILES += cmd-cat_mod-commands_cat.lst fs-cat_mod-commands_cat.lst
+COMMANDFILES += cmd-cat_mod-commands_cat.lst
+FSFILES += fs-cat_mod-commands_cat.lst
 
-cmd-cat.lst: commands/cat.c gencmdlist.sh
+cmd-cat_mod-commands_cat.lst: commands/cat.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh cat > $@ || (rm -f $@; exit 1)
 
-fs-cat.lst: commands/cat.c genfslist.sh
+fs-cat_mod-commands_cat.lst: commands/cat.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh cat > $@ || (rm -f $@; exit 1)
 
 
@@ -2153,14 +2153,14 @@ font_mod-font_manager.d: font/manager.c
 
 -include font_mod-font_manager.d
 
-CLEANFILES += cmd-manager.lst fs-manager.lst
-COMMANDFILES += cmd-manager.lst
-FSFILES += fs-manager.lst
+CLEANFILES += cmd-font_mod-font_manager.lst fs-font_mod-font_manager.lst
+COMMANDFILES += cmd-font_mod-font_manager.lst
+FSFILES += fs-font_mod-font_manager.lst
 
-cmd-manager.lst: font/manager.c gencmdlist.sh
+cmd-font_mod-font_manager.lst: font/manager.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh font > $@ || (rm -f $@; exit 1)
 
-fs-manager.lst: font/manager.c genfslist.sh
+fs-font_mod-font_manager.lst: font/manager.c genfslist.sh
 	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh font > $@ || (rm -f $@; exit 1)
 
 
@@ -2203,14 +2203,14 @@ amiga_mod-partmap_amiga.d: partmap/amiga.c
 
 -include amiga_mod-partmap_amiga.d
 
-CLEANFILES += cmd-amiga.lst fs-amiga.lst
-COMMANDFILES += cmd-amiga.lst
-FSFILES += fs-amiga.lst
+CLEANFILES += cmd-amiga_mod-partmap_amiga.lst fs-amiga_mod-partmap_amiga.lst
+COMMANDFILES += cmd-amiga_mod-partmap_amiga.lst
+FSFILES += fs-amiga_mod-partmap_amiga.lst
 
-cmd-amiga.lst: partmap/amiga.c gencmdlist.sh
+cmd-amiga_mod-partmap_amiga.lst: partmap/amiga.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh amiga > $@ || (rm -f $@; exit 1)
 
-fs-amiga.lst: partmap/amiga.c genfslist.sh
+fs-amiga_mod-partmap_amiga.lst: partmap/amiga.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh amiga > $@ || (rm -f $@; exit 1)
 
 
@@ -2253,14 +2253,14 @@ apple_mod-partmap_apple.d: partmap/apple.c
 
 -include apple_mod-partmap_apple.d
 
-CLEANFILES += cmd-apple.lst fs-apple.lst
-COMMANDFILES += cmd-apple.lst
-FSFILES += fs-apple.lst
+CLEANFILES += cmd-apple_mod-partmap_apple.lst fs-apple_mod-partmap_apple.lst
+COMMANDFILES += cmd-apple_mod-partmap_apple.lst
+FSFILES += fs-apple_mod-partmap_apple.lst
 
-cmd-apple.lst: partmap/apple.c gencmdlist.sh
+cmd-apple_mod-partmap_apple.lst: partmap/apple.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh apple > $@ || (rm -f $@; exit 1)
 
-fs-apple.lst: partmap/apple.c genfslist.sh
+fs-apple_mod-partmap_apple.lst: partmap/apple.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh apple > $@ || (rm -f $@; exit 1)
 
 
@@ -2303,14 +2303,14 @@ pc_mod-partmap_pc.d: partmap/pc.c
 
 -include pc_mod-partmap_pc.d
 
-CLEANFILES += cmd-pc.lst fs-pc.lst
-COMMANDFILES += cmd-pc.lst
-FSFILES += fs-pc.lst
+CLEANFILES += cmd-pc_mod-partmap_pc.lst fs-pc_mod-partmap_pc.lst
+COMMANDFILES += cmd-pc_mod-partmap_pc.lst
+FSFILES += fs-pc_mod-partmap_pc.lst
 
-cmd-pc.lst: partmap/pc.c gencmdlist.sh
+cmd-pc_mod-partmap_pc.lst: partmap/pc.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh pc > $@ || (rm -f $@; exit 1)
 
-fs-pc.lst: partmap/pc.c genfslist.sh
+fs-pc_mod-partmap_pc.lst: partmap/pc.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh pc > $@ || (rm -f $@; exit 1)
 
 
@@ -2353,14 +2353,14 @@ sun_mod-partmap_sun.d: partmap/sun.c
 
 -include sun_mod-partmap_sun.d
 
-CLEANFILES += cmd-sun.lst fs-sun.lst
-COMMANDFILES += cmd-sun.lst
-FSFILES += fs-sun.lst
+CLEANFILES += cmd-sun_mod-partmap_sun.lst fs-sun_mod-partmap_sun.lst
+COMMANDFILES += cmd-sun_mod-partmap_sun.lst
+FSFILES += fs-sun_mod-partmap_sun.lst
 
-cmd-sun.lst: partmap/sun.c gencmdlist.sh
+cmd-sun_mod-partmap_sun.lst: partmap/sun.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh sun > $@ || (rm -f $@; exit 1)
 
-fs-sun.lst: partmap/sun.c genfslist.sh
+fs-sun_mod-partmap_sun.lst: partmap/sun.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh sun > $@ || (rm -f $@; exit 1)
 
 
@@ -2403,14 +2403,14 @@ acorn_mod-partmap_acorn.d: partmap/acorn.c
 
 -include acorn_mod-partmap_acorn.d
 
-CLEANFILES += cmd-acorn.lst fs-acorn.lst
-COMMANDFILES += cmd-acorn.lst
-FSFILES += fs-acorn.lst
+CLEANFILES += cmd-acorn_mod-partmap_acorn.lst fs-acorn_mod-partmap_acorn.lst
+COMMANDFILES += cmd-acorn_mod-partmap_acorn.lst
+FSFILES += fs-acorn_mod-partmap_acorn.lst
 
-cmd-acorn.lst: partmap/acorn.c gencmdlist.sh
+cmd-acorn_mod-partmap_acorn.lst: partmap/acorn.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh acorn > $@ || (rm -f $@; exit 1)
 
-fs-acorn.lst: partmap/acorn.c genfslist.sh
+fs-acorn_mod-partmap_acorn.lst: partmap/acorn.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh acorn > $@ || (rm -f $@; exit 1)
 
 
@@ -2453,14 +2453,14 @@ loopback_mod-disk_loopback.d: disk/loopback.c
 
 -include loopback_mod-disk_loopback.d
 
-CLEANFILES += cmd-loopback.lst fs-loopback.lst
-COMMANDFILES += cmd-loopback.lst
-FSFILES += fs-loopback.lst
+CLEANFILES += cmd-loopback_mod-disk_loopback.lst fs-loopback_mod-disk_loopback.lst
+COMMANDFILES += cmd-loopback_mod-disk_loopback.lst
+FSFILES += fs-loopback_mod-disk_loopback.lst
 
-cmd-loopback.lst: disk/loopback.c gencmdlist.sh
+cmd-loopback_mod-disk_loopback.lst: disk/loopback.c gencmdlist.sh
 	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh loopback > $@ || (rm -f $@; exit 1)
 
-fs-loopback.lst: disk/loopback.c genfslist.sh
+fs-loopback_mod-disk_loopback.lst: disk/loopback.c genfslist.sh
 	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh loopback > $@ || (rm -f $@; exit 1)
 
 
@@ -2503,14 +2503,14 @@ suspend_mod-commands_ieee1275_suspend.d: commands/ieee1275/suspend.c
 
 -include suspend_mod-commands_ieee1275_suspend.d
 
-CLEANFILES += cmd-suspend.lst fs-suspend.lst
-COMMANDFILES += cmd-suspend.lst
-FSFILES += fs-suspend.lst
+CLEANFILES += cmd-suspend_mod-commands_ieee1275_suspend.lst fs-suspend_mod-commands_ieee1275_suspend.lst
+COMMANDFILES += cmd-suspend_mod-commands_ieee1275_suspend.lst
+FSFILES += fs-suspend_mod-commands_ieee1275_suspend.lst
 
-cmd-suspend.lst: commands/ieee1275/suspend.c gencmdlist.sh
+cmd-suspend_mod-commands_ieee1275_suspend.lst: commands/ieee1275/suspend.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(suspend_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh suspend > $@ || (rm -f $@; exit 1)
 
-fs-suspend.lst: commands/ieee1275/suspend.c genfslist.sh
+fs-suspend_mod-commands_ieee1275_suspend.lst: commands/ieee1275/suspend.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(suspend_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh suspend > $@ || (rm -f $@; exit 1)
 
 
@@ -2553,14 +2553,14 @@ reboot_mod-commands_ieee1275_reboot.d: commands/ieee1275/reboot.c
 
 -include reboot_mod-commands_ieee1275_reboot.d
 
-CLEANFILES += cmd-reboot.lst fs-reboot.lst
-COMMANDFILES += cmd-reboot.lst
-FSFILES += fs-reboot.lst
+CLEANFILES += cmd-reboot_mod-commands_ieee1275_reboot.lst fs-reboot_mod-commands_ieee1275_reboot.lst
+COMMANDFILES += cmd-reboot_mod-commands_ieee1275_reboot.lst
+FSFILES += fs-reboot_mod-commands_ieee1275_reboot.lst
 
-cmd-reboot.lst: commands/ieee1275/reboot.c gencmdlist.sh
+cmd-reboot_mod-commands_ieee1275_reboot.lst: commands/ieee1275/reboot.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(reboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh reboot > $@ || (rm -f $@; exit 1)
 
-fs-reboot.lst: commands/ieee1275/reboot.c genfslist.sh
+fs-reboot_mod-commands_ieee1275_reboot.lst: commands/ieee1275/reboot.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(reboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh reboot > $@ || (rm -f $@; exit 1)
 
 
@@ -2603,14 +2603,14 @@ halt_mod-commands_ieee1275_halt.d: commands/ieee1275/halt.c
 
 -include halt_mod-commands_ieee1275_halt.d
 
-CLEANFILES += cmd-halt.lst fs-halt.lst
-COMMANDFILES += cmd-halt.lst
-FSFILES += fs-halt.lst
+CLEANFILES += cmd-halt_mod-commands_ieee1275_halt.lst fs-halt_mod-commands_ieee1275_halt.lst
+COMMANDFILES += cmd-halt_mod-commands_ieee1275_halt.lst
+FSFILES += fs-halt_mod-commands_ieee1275_halt.lst
 
-cmd-halt.lst: commands/ieee1275/halt.c gencmdlist.sh
+cmd-halt_mod-commands_ieee1275_halt.lst: commands/ieee1275/halt.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(halt_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh halt > $@ || (rm -f $@; exit 1)
 
-fs-halt.lst: commands/ieee1275/halt.c genfslist.sh
+fs-halt_mod-commands_ieee1275_halt.lst: commands/ieee1275/halt.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(halt_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh halt > $@ || (rm -f $@; exit 1)
 
 
@@ -2653,14 +2653,14 @@ help_mod-commands_help.d: commands/help.c
 
 -include help_mod-commands_help.d
 
-CLEANFILES += cmd-help.lst fs-help.lst
-COMMANDFILES += cmd-help.lst
-FSFILES += fs-help.lst
+CLEANFILES += cmd-help_mod-commands_help.lst fs-help_mod-commands_help.lst
+COMMANDFILES += cmd-help_mod-commands_help.lst
+FSFILES += fs-help_mod-commands_help.lst
 
-cmd-help.lst: commands/help.c gencmdlist.sh
+cmd-help_mod-commands_help.lst: commands/help.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh help > $@ || (rm -f $@; exit 1)
 
-fs-help.lst: commands/help.c genfslist.sh
+fs-help_mod-commands_help.lst: commands/help.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh help > $@ || (rm -f $@; exit 1)
 
 
@@ -2703,14 +2703,14 @@ default_mod-commands_default.d: commands/default.c
 
 -include default_mod-commands_default.d
 
-CLEANFILES += cmd-default.lst fs-default.lst
-COMMANDFILES += cmd-default.lst
-FSFILES += fs-default.lst
+CLEANFILES += cmd-default_mod-commands_default.lst fs-default_mod-commands_default.lst
+COMMANDFILES += cmd-default_mod-commands_default.lst
+FSFILES += fs-default_mod-commands_default.lst
 
-cmd-default.lst: commands/default.c gencmdlist.sh
+cmd-default_mod-commands_default.lst: commands/default.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh default > $@ || (rm -f $@; exit 1)
 
-fs-default.lst: commands/default.c genfslist.sh
+fs-default_mod-commands_default.lst: commands/default.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh default > $@ || (rm -f $@; exit 1)
 
 
@@ -2753,14 +2753,14 @@ timeout_mod-commands_timeout.d: commands/timeout.c
 
 -include timeout_mod-commands_timeout.d
 
-CLEANFILES += cmd-timeout.lst fs-timeout.lst
-COMMANDFILES += cmd-timeout.lst
-FSFILES += fs-timeout.lst
+CLEANFILES += cmd-timeout_mod-commands_timeout.lst fs-timeout_mod-commands_timeout.lst
+COMMANDFILES += cmd-timeout_mod-commands_timeout.lst
+FSFILES += fs-timeout_mod-commands_timeout.lst
 
-cmd-timeout.lst: commands/timeout.c gencmdlist.sh
+cmd-timeout_mod-commands_timeout.lst: commands/timeout.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh timeout > $@ || (rm -f $@; exit 1)
 
-fs-timeout.lst: commands/timeout.c genfslist.sh
+fs-timeout_mod-commands_timeout.lst: commands/timeout.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh timeout > $@ || (rm -f $@; exit 1)
 
 
@@ -2803,14 +2803,14 @@ configfile_mod-commands_configfile.d: commands/configfile.c
 
 -include configfile_mod-commands_configfile.d
 
-CLEANFILES += cmd-configfile.lst fs-configfile.lst
-COMMANDFILES += cmd-configfile.lst
-FSFILES += fs-configfile.lst
+CLEANFILES += cmd-configfile_mod-commands_configfile.lst fs-configfile_mod-commands_configfile.lst
+COMMANDFILES += cmd-configfile_mod-commands_configfile.lst
+FSFILES += fs-configfile_mod-commands_configfile.lst
 
-cmd-configfile.lst: commands/configfile.c gencmdlist.sh
+cmd-configfile_mod-commands_configfile.lst: commands/configfile.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh configfile > $@ || (rm -f $@; exit 1)
 
-fs-configfile.lst: commands/configfile.c genfslist.sh
+fs-configfile_mod-commands_configfile.lst: commands/configfile.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh configfile > $@ || (rm -f $@; exit 1)
 
 
@@ -2853,14 +2853,14 @@ search_mod-commands_search.d: commands/search.c
 
 -include search_mod-commands_search.d
 
-CLEANFILES += cmd-search.lst fs-search.lst
-COMMANDFILES += cmd-search.lst
-FSFILES += fs-search.lst
+CLEANFILES += cmd-search_mod-commands_search.lst fs-search_mod-commands_search.lst
+COMMANDFILES += cmd-search_mod-commands_search.lst
+FSFILES += fs-search_mod-commands_search.lst
 
-cmd-search.lst: commands/search.c gencmdlist.sh
+cmd-search_mod-commands_search.lst: commands/search.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh search > $@ || (rm -f $@; exit 1)
 
-fs-search.lst: commands/search.c genfslist.sh
+fs-search_mod-commands_search.lst: commands/search.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh search > $@ || (rm -f $@; exit 1)
 
 
@@ -2903,14 +2903,14 @@ gzio_mod-io_gzio.d: io/gzio.c
 
 -include gzio_mod-io_gzio.d
 
-CLEANFILES += cmd-gzio.lst fs-gzio.lst
-COMMANDFILES += cmd-gzio.lst
-FSFILES += fs-gzio.lst
+CLEANFILES += cmd-gzio_mod-io_gzio.lst fs-gzio_mod-io_gzio.lst
+COMMANDFILES += cmd-gzio_mod-io_gzio.lst
+FSFILES += fs-gzio_mod-io_gzio.lst
 
-cmd-gzio.lst: io/gzio.c gencmdlist.sh
+cmd-gzio_mod-io_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
+fs-gzio_mod-io_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)
 
 
@@ -2953,26 +2953,15 @@ test_mod-commands_test.d: commands/test.c
 
 -include test_mod-commands_test.d
 
-CLEANFILES += cmd-test.lst fs-test.lst
-COMMANDFILES += cmd-test.lst
-FSFILES += fs-test.lst
+CLEANFILES += cmd-test_mod-commands_test.lst fs-test_mod-commands_test.lst
+COMMANDFILES += cmd-test_mod-commands_test.lst
+FSFILES += fs-test_mod-commands_test.lst
 
-cmd-test.lst: commands/test.c gencmdlist.sh
+cmd-test_mod-commands_test.lst: commands/test.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(test_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh test > $@ || (rm -f $@; exit 1)
 
-fs-test.lst: commands/test.c genfslist.sh
+fs-test_mod-commands_test.lst: commands/test.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(test_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh test > $@ || (rm -f $@; exit 1)
 
 
 test_mod_CFLAGS = $(COMMON_CFLAGS)
-CLEANFILES += moddep.lst command.lst fs.lst
-pkgdata_DATA += moddep.lst command.lst fs.lst
-moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
-	cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
-	  || (rm -f $@; exit 1)
-
-command.lst: $(COMMANDFILES)
-	cat $^ /dev/null | sort > $@
-
-fs.lst: $(FSFILES)
-	cat $^ /dev/null | sort > $@
diff --git a/conf/sparc64-ieee1275.mk b/conf/sparc64-ieee1275.mk
index 2f3732c60..ef1d4127f 100644
--- a/conf/sparc64-ieee1275.mk
+++ b/conf/sparc64-ieee1275.mk
@@ -20,9 +20,7 @@ grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) gensymlist.sh
 	sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
 
 # For the parser.
-grub_script.tab.c: normal/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
-grub_script.tab.h: normal/parser.y
+grub_script.tab.c grub_script.tab.h: normal/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y
 
 kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) genkernsyms.sh
@@ -330,14 +328,14 @@ fshelp_mod-fs_fshelp.d: fs/fshelp.c
 
 -include fshelp_mod-fs_fshelp.d
 
-CLEANFILES += cmd-fshelp.lst fs-fshelp.lst
-COMMANDFILES += cmd-fshelp.lst
-FSFILES += fs-fshelp.lst
+CLEANFILES += cmd-fshelp_mod-fs_fshelp.lst fs-fshelp_mod-fs_fshelp.lst
+COMMANDFILES += cmd-fshelp_mod-fs_fshelp.lst
+FSFILES += fs-fshelp_mod-fs_fshelp.lst
 
-cmd-fshelp.lst: fs/fshelp.c gencmdlist.sh
+cmd-fshelp_mod-fs_fshelp.lst: fs/fshelp.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh fshelp > $@ || (rm -f $@; exit 1)
 
-fs-fshelp.lst: fs/fshelp.c genfslist.sh
+fs-fshelp_mod-fs_fshelp.lst: fs/fshelp.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fshelp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh fshelp > $@ || (rm -f $@; exit 1)
 
 
@@ -381,14 +379,14 @@ fat_mod-fs_fat.d: fs/fat.c
 
 -include fat_mod-fs_fat.d
 
-CLEANFILES += cmd-fat.lst fs-fat.lst
-COMMANDFILES += cmd-fat.lst
-FSFILES += fs-fat.lst
+CLEANFILES += cmd-fat_mod-fs_fat.lst fs-fat_mod-fs_fat.lst
+COMMANDFILES += cmd-fat_mod-fs_fat.lst
+FSFILES += fs-fat_mod-fs_fat.lst
 
-cmd-fat.lst: fs/fat.c gencmdlist.sh
+cmd-fat_mod-fs_fat.lst: fs/fat.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh fat > $@ || (rm -f $@; exit 1)
 
-fs-fat.lst: fs/fat.c genfslist.sh
+fs-fat_mod-fs_fat.lst: fs/fat.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(fat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh fat > $@ || (rm -f $@; exit 1)
 
 
@@ -432,14 +430,14 @@ ext2_mod-fs_ext2.d: fs/ext2.c
 
 -include ext2_mod-fs_ext2.d
 
-CLEANFILES += cmd-ext2.lst fs-ext2.lst
-COMMANDFILES += cmd-ext2.lst
-FSFILES += fs-ext2.lst
+CLEANFILES += cmd-ext2_mod-fs_ext2.lst fs-ext2_mod-fs_ext2.lst
+COMMANDFILES += cmd-ext2_mod-fs_ext2.lst
+FSFILES += fs-ext2_mod-fs_ext2.lst
 
-cmd-ext2.lst: fs/ext2.c gencmdlist.sh
+cmd-ext2_mod-fs_ext2.lst: fs/ext2.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ext2 > $@ || (rm -f $@; exit 1)
 
-fs-ext2.lst: fs/ext2.c genfslist.sh
+fs-ext2_mod-fs_ext2.lst: fs/ext2.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ext2_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ext2 > $@ || (rm -f $@; exit 1)
 
 
@@ -483,14 +481,14 @@ ufs_mod-fs_ufs.d: fs/ufs.c
 
 -include ufs_mod-fs_ufs.d
 
-CLEANFILES += cmd-ufs.lst fs-ufs.lst
-COMMANDFILES += cmd-ufs.lst
-FSFILES += fs-ufs.lst
+CLEANFILES += cmd-ufs_mod-fs_ufs.lst fs-ufs_mod-fs_ufs.lst
+COMMANDFILES += cmd-ufs_mod-fs_ufs.lst
+FSFILES += fs-ufs_mod-fs_ufs.lst
 
-cmd-ufs.lst: fs/ufs.c gencmdlist.sh
+cmd-ufs_mod-fs_ufs.lst: fs/ufs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ufs > $@ || (rm -f $@; exit 1)
 
-fs-ufs.lst: fs/ufs.c genfslist.sh
+fs-ufs_mod-fs_ufs.lst: fs/ufs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(ufs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ufs > $@ || (rm -f $@; exit 1)
 
 
@@ -534,14 +532,14 @@ minix_mod-fs_minix.d: fs/minix.c
 
 -include minix_mod-fs_minix.d
 
-CLEANFILES += cmd-minix.lst fs-minix.lst
-COMMANDFILES += cmd-minix.lst
-FSFILES += fs-minix.lst
+CLEANFILES += cmd-minix_mod-fs_minix.lst fs-minix_mod-fs_minix.lst
+COMMANDFILES += cmd-minix_mod-fs_minix.lst
+FSFILES += fs-minix_mod-fs_minix.lst
 
-cmd-minix.lst: fs/minix.c gencmdlist.sh
+cmd-minix_mod-fs_minix.lst: fs/minix.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh minix > $@ || (rm -f $@; exit 1)
 
-fs-minix.lst: fs/minix.c genfslist.sh
+fs-minix_mod-fs_minix.lst: fs/minix.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(minix_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh minix > $@ || (rm -f $@; exit 1)
 
 
@@ -585,14 +583,14 @@ hfs_mod-fs_hfs.d: fs/hfs.c
 
 -include hfs_mod-fs_hfs.d
 
-CLEANFILES += cmd-hfs.lst fs-hfs.lst
-COMMANDFILES += cmd-hfs.lst
-FSFILES += fs-hfs.lst
+CLEANFILES += cmd-hfs_mod-fs_hfs.lst fs-hfs_mod-fs_hfs.lst
+COMMANDFILES += cmd-hfs_mod-fs_hfs.lst
+FSFILES += fs-hfs_mod-fs_hfs.lst
 
-cmd-hfs.lst: fs/hfs.c gencmdlist.sh
+cmd-hfs_mod-fs_hfs.lst: fs/hfs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh hfs > $@ || (rm -f $@; exit 1)
 
-fs-hfs.lst: fs/hfs.c genfslist.sh
+fs-hfs_mod-fs_hfs.lst: fs/hfs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(hfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh hfs > $@ || (rm -f $@; exit 1)
 
 
@@ -636,14 +634,14 @@ jfs_mod-fs_jfs.d: fs/jfs.c
 
 -include jfs_mod-fs_jfs.d
 
-CLEANFILES += cmd-jfs.lst fs-jfs.lst
-COMMANDFILES += cmd-jfs.lst
-FSFILES += fs-jfs.lst
+CLEANFILES += cmd-jfs_mod-fs_jfs.lst fs-jfs_mod-fs_jfs.lst
+COMMANDFILES += cmd-jfs_mod-fs_jfs.lst
+FSFILES += fs-jfs_mod-fs_jfs.lst
 
-cmd-jfs.lst: fs/jfs.c gencmdlist.sh
+cmd-jfs_mod-fs_jfs.lst: fs/jfs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh jfs > $@ || (rm -f $@; exit 1)
 
-fs-jfs.lst: fs/jfs.c genfslist.sh
+fs-jfs_mod-fs_jfs.lst: fs/jfs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(jfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh jfs > $@ || (rm -f $@; exit 1)
 
 
@@ -692,14 +690,14 @@ xfs_mod-fs_xfs.d: fs/xfs.c
 
 -include xfs_mod-fs_xfs.d
 
-CLEANFILES += cmd-xfs.lst fs-xfs.lst
-COMMANDFILES += cmd-xfs.lst
-FSFILES += fs-xfs.lst
+CLEANFILES += cmd-xfs_mod-fs_xfs.lst fs-xfs_mod-fs_xfs.lst
+COMMANDFILES += cmd-xfs_mod-fs_xfs.lst
+FSFILES += fs-xfs_mod-fs_xfs.lst
 
-cmd-xfs.lst: fs/xfs.c gencmdlist.sh
+cmd-xfs_mod-fs_xfs.lst: fs/xfs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh xfs > $@ || (rm -f $@; exit 1)
 
-fs-xfs.lst: fs/xfs.c genfslist.sh
+fs-xfs_mod-fs_xfs.lst: fs/xfs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(xfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh xfs > $@ || (rm -f $@; exit 1)
 
 
@@ -743,14 +741,14 @@ affs_mod-fs_affs.d: fs/affs.c
 
 -include affs_mod-fs_affs.d
 
-CLEANFILES += cmd-affs.lst fs-affs.lst
-COMMANDFILES += cmd-affs.lst
-FSFILES += fs-affs.lst
+CLEANFILES += cmd-affs_mod-fs_affs.lst fs-affs_mod-fs_affs.lst
+COMMANDFILES += cmd-affs_mod-fs_affs.lst
+FSFILES += fs-affs_mod-fs_affs.lst
 
-cmd-affs.lst: fs/affs.c gencmdlist.sh
+cmd-affs_mod-fs_affs.lst: fs/affs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh affs > $@ || (rm -f $@; exit 1)
 
-fs-affs.lst: fs/affs.c genfslist.sh
+fs-affs_mod-fs_affs.lst: fs/affs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(affs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh affs > $@ || (rm -f $@; exit 1)
 
 
@@ -794,14 +792,14 @@ sfs_mod-fs_sfs.d: fs/sfs.c
 
 -include sfs_mod-fs_sfs.d
 
-CLEANFILES += cmd-sfs.lst fs-sfs.lst
-COMMANDFILES += cmd-sfs.lst
-FSFILES += fs-sfs.lst
+CLEANFILES += cmd-sfs_mod-fs_sfs.lst fs-sfs_mod-fs_sfs.lst
+COMMANDFILES += cmd-sfs_mod-fs_sfs.lst
+FSFILES += fs-sfs_mod-fs_sfs.lst
 
-cmd-sfs.lst: fs/sfs.c gencmdlist.sh
+cmd-sfs_mod-fs_sfs.lst: fs/sfs.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh sfs > $@ || (rm -f $@; exit 1)
 
-fs-sfs.lst: fs/sfs.c genfslist.sh
+fs-sfs_mod-fs_sfs.lst: fs/sfs.c genfslist.sh
 	set -e; 	  $(CC) -Ifs -I$(srcdir)/fs $(CPPFLAGS) $(CFLAGS) $(sfs_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh sfs > $@ || (rm -f $@; exit 1)
 
 
@@ -860,14 +858,14 @@ normal_mod-normal_arg.d: normal/arg.c
 
 -include normal_mod-normal_arg.d
 
-CLEANFILES += cmd-arg.lst fs-arg.lst
-COMMANDFILES += cmd-arg.lst
-FSFILES += fs-arg.lst
+CLEANFILES += cmd-normal_mod-normal_arg.lst fs-normal_mod-normal_arg.lst
+COMMANDFILES += cmd-normal_mod-normal_arg.lst
+FSFILES += fs-normal_mod-normal_arg.lst
 
-cmd-arg.lst: normal/arg.c gencmdlist.sh
+cmd-normal_mod-normal_arg.lst: normal/arg.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-arg.lst: normal/arg.c genfslist.sh
+fs-normal_mod-normal_arg.lst: normal/arg.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -879,14 +877,14 @@ normal_mod-normal_cmdline.d: normal/cmdline.c
 
 -include normal_mod-normal_cmdline.d
 
-CLEANFILES += cmd-cmdline.lst fs-cmdline.lst
-COMMANDFILES += cmd-cmdline.lst
-FSFILES += fs-cmdline.lst
+CLEANFILES += cmd-normal_mod-normal_cmdline.lst fs-normal_mod-normal_cmdline.lst
+COMMANDFILES += cmd-normal_mod-normal_cmdline.lst
+FSFILES += fs-normal_mod-normal_cmdline.lst
 
-cmd-cmdline.lst: normal/cmdline.c gencmdlist.sh
+cmd-normal_mod-normal_cmdline.lst: normal/cmdline.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-cmdline.lst: normal/cmdline.c genfslist.sh
+fs-normal_mod-normal_cmdline.lst: normal/cmdline.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -898,14 +896,14 @@ normal_mod-normal_command.d: normal/command.c
 
 -include normal_mod-normal_command.d
 
-CLEANFILES += cmd-command.lst fs-command.lst
-COMMANDFILES += cmd-command.lst
-FSFILES += fs-command.lst
+CLEANFILES += cmd-normal_mod-normal_command.lst fs-normal_mod-normal_command.lst
+COMMANDFILES += cmd-normal_mod-normal_command.lst
+FSFILES += fs-normal_mod-normal_command.lst
 
-cmd-command.lst: normal/command.c gencmdlist.sh
+cmd-normal_mod-normal_command.lst: normal/command.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-command.lst: normal/command.c genfslist.sh
+fs-normal_mod-normal_command.lst: normal/command.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -917,14 +915,14 @@ normal_mod-normal_completion.d: normal/completion.c
 
 -include normal_mod-normal_completion.d
 
-CLEANFILES += cmd-completion.lst fs-completion.lst
-COMMANDFILES += cmd-completion.lst
-FSFILES += fs-completion.lst
+CLEANFILES += cmd-normal_mod-normal_completion.lst fs-normal_mod-normal_completion.lst
+COMMANDFILES += cmd-normal_mod-normal_completion.lst
+FSFILES += fs-normal_mod-normal_completion.lst
 
-cmd-completion.lst: normal/completion.c gencmdlist.sh
+cmd-normal_mod-normal_completion.lst: normal/completion.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-completion.lst: normal/completion.c genfslist.sh
+fs-normal_mod-normal_completion.lst: normal/completion.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -936,14 +934,14 @@ normal_mod-normal_context.d: normal/context.c
 
 -include normal_mod-normal_context.d
 
-CLEANFILES += cmd-context.lst fs-context.lst
-COMMANDFILES += cmd-context.lst
-FSFILES += fs-context.lst
+CLEANFILES += cmd-normal_mod-normal_context.lst fs-normal_mod-normal_context.lst
+COMMANDFILES += cmd-normal_mod-normal_context.lst
+FSFILES += fs-normal_mod-normal_context.lst
 
-cmd-context.lst: normal/context.c gencmdlist.sh
+cmd-normal_mod-normal_context.lst: normal/context.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-context.lst: normal/context.c genfslist.sh
+fs-normal_mod-normal_context.lst: normal/context.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -955,14 +953,14 @@ normal_mod-normal_execute.d: normal/execute.c
 
 -include normal_mod-normal_execute.d
 
-CLEANFILES += cmd-execute.lst fs-execute.lst
-COMMANDFILES += cmd-execute.lst
-FSFILES += fs-execute.lst
+CLEANFILES += cmd-normal_mod-normal_execute.lst fs-normal_mod-normal_execute.lst
+COMMANDFILES += cmd-normal_mod-normal_execute.lst
+FSFILES += fs-normal_mod-normal_execute.lst
 
-cmd-execute.lst: normal/execute.c gencmdlist.sh
+cmd-normal_mod-normal_execute.lst: normal/execute.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-execute.lst: normal/execute.c genfslist.sh
+fs-normal_mod-normal_execute.lst: normal/execute.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -974,14 +972,14 @@ normal_mod-normal_function.d: normal/function.c
 
 -include normal_mod-normal_function.d
 
-CLEANFILES += cmd-function.lst fs-function.lst
-COMMANDFILES += cmd-function.lst
-FSFILES += fs-function.lst
+CLEANFILES += cmd-normal_mod-normal_function.lst fs-normal_mod-normal_function.lst
+COMMANDFILES += cmd-normal_mod-normal_function.lst
+FSFILES += fs-normal_mod-normal_function.lst
 
-cmd-function.lst: normal/function.c gencmdlist.sh
+cmd-normal_mod-normal_function.lst: normal/function.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-function.lst: normal/function.c genfslist.sh
+fs-normal_mod-normal_function.lst: normal/function.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -993,14 +991,14 @@ normal_mod-normal_lexer.d: normal/lexer.c
 
 -include normal_mod-normal_lexer.d
 
-CLEANFILES += cmd-lexer.lst fs-lexer.lst
-COMMANDFILES += cmd-lexer.lst
-FSFILES += fs-lexer.lst
+CLEANFILES += cmd-normal_mod-normal_lexer.lst fs-normal_mod-normal_lexer.lst
+COMMANDFILES += cmd-normal_mod-normal_lexer.lst
+FSFILES += fs-normal_mod-normal_lexer.lst
 
-cmd-lexer.lst: normal/lexer.c gencmdlist.sh
+cmd-normal_mod-normal_lexer.lst: normal/lexer.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-lexer.lst: normal/lexer.c genfslist.sh
+fs-normal_mod-normal_lexer.lst: normal/lexer.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1012,14 +1010,14 @@ normal_mod-normal_main.d: normal/main.c
 
 -include normal_mod-normal_main.d
 
-CLEANFILES += cmd-main.lst fs-main.lst
-COMMANDFILES += cmd-main.lst
-FSFILES += fs-main.lst
+CLEANFILES += cmd-normal_mod-normal_main.lst fs-normal_mod-normal_main.lst
+COMMANDFILES += cmd-normal_mod-normal_main.lst
+FSFILES += fs-normal_mod-normal_main.lst
 
-cmd-main.lst: normal/main.c gencmdlist.sh
+cmd-normal_mod-normal_main.lst: normal/main.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-main.lst: normal/main.c genfslist.sh
+fs-normal_mod-normal_main.lst: normal/main.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1031,14 +1029,14 @@ normal_mod-normal_menu.d: normal/menu.c
 
 -include normal_mod-normal_menu.d
 
-CLEANFILES += cmd-menu.lst fs-menu.lst
-COMMANDFILES += cmd-menu.lst
-FSFILES += fs-menu.lst
+CLEANFILES += cmd-normal_mod-normal_menu.lst fs-normal_mod-normal_menu.lst
+COMMANDFILES += cmd-normal_mod-normal_menu.lst
+FSFILES += fs-normal_mod-normal_menu.lst
 
-cmd-menu.lst: normal/menu.c gencmdlist.sh
+cmd-normal_mod-normal_menu.lst: normal/menu.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-menu.lst: normal/menu.c genfslist.sh
+fs-normal_mod-normal_menu.lst: normal/menu.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1050,14 +1048,14 @@ normal_mod-normal_menu_entry.d: normal/menu_entry.c
 
 -include normal_mod-normal_menu_entry.d
 
-CLEANFILES += cmd-menu_entry.lst fs-menu_entry.lst
-COMMANDFILES += cmd-menu_entry.lst
-FSFILES += fs-menu_entry.lst
+CLEANFILES += cmd-normal_mod-normal_menu_entry.lst fs-normal_mod-normal_menu_entry.lst
+COMMANDFILES += cmd-normal_mod-normal_menu_entry.lst
+FSFILES += fs-normal_mod-normal_menu_entry.lst
 
-cmd-menu_entry.lst: normal/menu_entry.c gencmdlist.sh
+cmd-normal_mod-normal_menu_entry.lst: normal/menu_entry.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-menu_entry.lst: normal/menu_entry.c genfslist.sh
+fs-normal_mod-normal_menu_entry.lst: normal/menu_entry.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1069,14 +1067,14 @@ normal_mod-normal_misc.d: normal/misc.c
 
 -include normal_mod-normal_misc.d
 
-CLEANFILES += cmd-misc.lst fs-misc.lst
-COMMANDFILES += cmd-misc.lst
-FSFILES += fs-misc.lst
+CLEANFILES += cmd-normal_mod-normal_misc.lst fs-normal_mod-normal_misc.lst
+COMMANDFILES += cmd-normal_mod-normal_misc.lst
+FSFILES += fs-normal_mod-normal_misc.lst
 
-cmd-misc.lst: normal/misc.c gencmdlist.sh
+cmd-normal_mod-normal_misc.lst: normal/misc.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-misc.lst: normal/misc.c genfslist.sh
+fs-normal_mod-normal_misc.lst: normal/misc.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1088,14 +1086,14 @@ normal_mod-normal_script.d: normal/script.c
 
 -include normal_mod-normal_script.d
 
-CLEANFILES += cmd-script.lst fs-script.lst
-COMMANDFILES += cmd-script.lst
-FSFILES += fs-script.lst
+CLEANFILES += cmd-normal_mod-normal_script.lst fs-normal_mod-normal_script.lst
+COMMANDFILES += cmd-normal_mod-normal_script.lst
+FSFILES += fs-normal_mod-normal_script.lst
 
-cmd-script.lst: normal/script.c gencmdlist.sh
+cmd-normal_mod-normal_script.lst: normal/script.c gencmdlist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-script.lst: normal/script.c genfslist.sh
+fs-normal_mod-normal_script.lst: normal/script.c genfslist.sh
 	set -e; 	  $(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1107,14 +1105,14 @@ normal_mod-normal_sparc64_setjmp.d: normal/sparc64/setjmp.S
 
 -include normal_mod-normal_sparc64_setjmp.d
 
-CLEANFILES += cmd-setjmp.lst fs-setjmp.lst
-COMMANDFILES += cmd-setjmp.lst
-FSFILES += fs-setjmp.lst
+CLEANFILES += cmd-normal_mod-normal_sparc64_setjmp.lst fs-normal_mod-normal_sparc64_setjmp.lst
+COMMANDFILES += cmd-normal_mod-normal_sparc64_setjmp.lst
+FSFILES += fs-normal_mod-normal_sparc64_setjmp.lst
 
-cmd-setjmp.lst: normal/sparc64/setjmp.S gencmdlist.sh
+cmd-normal_mod-normal_sparc64_setjmp.lst: normal/sparc64/setjmp.S gencmdlist.sh
 	set -e; 	  $(CC) -Inormal/sparc64 -I$(srcdir)/normal/sparc64 $(CPPFLAGS) $(ASFLAGS) $(normal_mod_ASFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-setjmp.lst: normal/sparc64/setjmp.S genfslist.sh
+fs-normal_mod-normal_sparc64_setjmp.lst: normal/sparc64/setjmp.S genfslist.sh
 	set -e; 	  $(CC) -Inormal/sparc64 -I$(srcdir)/normal/sparc64 $(CPPFLAGS) $(ASFLAGS) $(normal_mod_ASFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1126,14 +1124,14 @@ normal_mod-grub_script_tab.d: grub_script.tab.c
 
 -include normal_mod-grub_script_tab.d
 
-CLEANFILES += cmd-grub_script.tab.lst fs-grub_script.tab.lst
-COMMANDFILES += cmd-grub_script.tab.lst
-FSFILES += fs-grub_script.tab.lst
+CLEANFILES += cmd-normal_mod-grub_script_tab.lst fs-normal_mod-grub_script_tab.lst
+COMMANDFILES += cmd-normal_mod-grub_script_tab.lst
+FSFILES += fs-normal_mod-grub_script_tab.lst
 
-cmd-grub_script.tab.lst: grub_script.tab.c gencmdlist.sh
+cmd-normal_mod-grub_script_tab.lst: grub_script.tab.c gencmdlist.sh
 	set -e; 	  $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh normal > $@ || (rm -f $@; exit 1)
 
-fs-grub_script.tab.lst: grub_script.tab.c genfslist.sh
+fs-normal_mod-grub_script_tab.lst: grub_script.tab.c genfslist.sh
 	set -e; 	  $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh normal > $@ || (rm -f $@; exit 1)
 
 
@@ -1178,14 +1176,14 @@ hello_mod-hello_hello.d: hello/hello.c
 
 -include hello_mod-hello_hello.d
 
-CLEANFILES += cmd-hello.lst fs-hello.lst
-COMMANDFILES += cmd-hello.lst
-FSFILES += fs-hello.lst
+CLEANFILES += cmd-hello_mod-hello_hello.lst fs-hello_mod-hello_hello.lst
+COMMANDFILES += cmd-hello_mod-hello_hello.lst
+FSFILES += fs-hello_mod-hello_hello.lst
 
-cmd-hello.lst: hello/hello.c gencmdlist.sh
+cmd-hello_mod-hello_hello.lst: hello/hello.c gencmdlist.sh
 	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh hello > $@ || (rm -f $@; exit 1)
 
-fs-hello.lst: hello/hello.c genfslist.sh
+fs-hello_mod-hello_hello.lst: hello/hello.c genfslist.sh
 	set -e; 	  $(CC) -Ihello -I$(srcdir)/hello $(CPPFLAGS) $(CFLAGS) $(hello_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh hello > $@ || (rm -f $@; exit 1)
 
 
@@ -1229,14 +1227,14 @@ boot_mod-commands_boot.d: commands/boot.c
 
 -include boot_mod-commands_boot.d
 
-CLEANFILES += cmd-boot.lst fs-boot.lst
-COMMANDFILES += cmd-boot.lst
-FSFILES += fs-boot.lst
+CLEANFILES += cmd-boot_mod-commands_boot.lst fs-boot_mod-commands_boot.lst
+COMMANDFILES += cmd-boot_mod-commands_boot.lst
+FSFILES += fs-boot_mod-commands_boot.lst
 
-cmd-boot.lst: commands/boot.c gencmdlist.sh
+cmd-boot_mod-commands_boot.lst: commands/boot.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh boot > $@ || (rm -f $@; exit 1)
 
-fs-boot.lst: commands/boot.c genfslist.sh
+fs-boot_mod-commands_boot.lst: commands/boot.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(boot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh boot > $@ || (rm -f $@; exit 1)
 
 
@@ -1280,14 +1278,14 @@ terminal_mod-commands_terminal.d: commands/terminal.c
 
 -include terminal_mod-commands_terminal.d
 
-CLEANFILES += cmd-terminal.lst fs-terminal.lst
-COMMANDFILES += cmd-terminal.lst
-FSFILES += fs-terminal.lst
+CLEANFILES += cmd-terminal_mod-commands_terminal.lst fs-terminal_mod-commands_terminal.lst
+COMMANDFILES += cmd-terminal_mod-commands_terminal.lst
+FSFILES += fs-terminal_mod-commands_terminal.lst
 
-cmd-terminal.lst: commands/terminal.c gencmdlist.sh
+cmd-terminal_mod-commands_terminal.lst: commands/terminal.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh terminal > $@ || (rm -f $@; exit 1)
 
-fs-terminal.lst: commands/terminal.c genfslist.sh
+fs-terminal_mod-commands_terminal.lst: commands/terminal.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(terminal_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh terminal > $@ || (rm -f $@; exit 1)
 
 
@@ -1331,14 +1329,14 @@ ls_mod-commands_ls.d: commands/ls.c
 
 -include ls_mod-commands_ls.d
 
-CLEANFILES += cmd-ls.lst fs-ls.lst
-COMMANDFILES += cmd-ls.lst
-FSFILES += fs-ls.lst
+CLEANFILES += cmd-ls_mod-commands_ls.lst fs-ls_mod-commands_ls.lst
+COMMANDFILES += cmd-ls_mod-commands_ls.lst
+FSFILES += fs-ls_mod-commands_ls.lst
 
-cmd-ls.lst: commands/ls.c gencmdlist.sh
+cmd-ls_mod-commands_ls.lst: commands/ls.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh ls > $@ || (rm -f $@; exit 1)
 
-fs-ls.lst: commands/ls.c genfslist.sh
+fs-ls_mod-commands_ls.lst: commands/ls.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh ls > $@ || (rm -f $@; exit 1)
 
 
@@ -1382,14 +1380,14 @@ cmp_mod-commands_cmp.d: commands/cmp.c
 
 -include cmp_mod-commands_cmp.d
 
-CLEANFILES += cmd-cmp.lst fs-cmp.lst
-COMMANDFILES += cmd-cmp.lst
-FSFILES += fs-cmp.lst
+CLEANFILES += cmd-cmp_mod-commands_cmp.lst fs-cmp_mod-commands_cmp.lst
+COMMANDFILES += cmd-cmp_mod-commands_cmp.lst
+FSFILES += fs-cmp_mod-commands_cmp.lst
 
-cmd-cmp.lst: commands/cmp.c gencmdlist.sh
+cmd-cmp_mod-commands_cmp.lst: commands/cmp.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh cmp > $@ || (rm -f $@; exit 1)
 
-fs-cmp.lst: commands/cmp.c genfslist.sh
+fs-cmp_mod-commands_cmp.lst: commands/cmp.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cmp_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh cmp > $@ || (rm -f $@; exit 1)
 
 
@@ -1433,14 +1431,14 @@ cat_mod-commands_cat.d: commands/cat.c
 
 -include cat_mod-commands_cat.d
 
-CLEANFILES += cmd-cat.lst fs-cat.lst
-COMMANDFILES += cmd-cat.lst
-FSFILES += fs-cat.lst
+CLEANFILES += cmd-cat_mod-commands_cat.lst fs-cat_mod-commands_cat.lst
+COMMANDFILES += cmd-cat_mod-commands_cat.lst
+FSFILES += fs-cat_mod-commands_cat.lst
 
-cmd-cat.lst: commands/cat.c gencmdlist.sh
+cmd-cat_mod-commands_cat.lst: commands/cat.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh cat > $@ || (rm -f $@; exit 1)
 
-fs-cat.lst: commands/cat.c genfslist.sh
+fs-cat_mod-commands_cat.lst: commands/cat.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(cat_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh cat > $@ || (rm -f $@; exit 1)
 
 
@@ -1484,14 +1482,14 @@ font_mod-font_manager.d: font/manager.c
 
 -include font_mod-font_manager.d
 
-CLEANFILES += cmd-manager.lst fs-manager.lst
-COMMANDFILES += cmd-manager.lst
-FSFILES += fs-manager.lst
+CLEANFILES += cmd-font_mod-font_manager.lst fs-font_mod-font_manager.lst
+COMMANDFILES += cmd-font_mod-font_manager.lst
+FSFILES += fs-font_mod-font_manager.lst
 
-cmd-manager.lst: font/manager.c gencmdlist.sh
+cmd-font_mod-font_manager.lst: font/manager.c gencmdlist.sh
 	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh font > $@ || (rm -f $@; exit 1)
 
-fs-manager.lst: font/manager.c genfslist.sh
+fs-font_mod-font_manager.lst: font/manager.c genfslist.sh
 	set -e; 	  $(CC) -Ifont -I$(srcdir)/font $(CPPFLAGS) $(CFLAGS) $(font_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh font > $@ || (rm -f $@; exit 1)
 
 
@@ -1535,14 +1533,14 @@ amiga_mod-partmap_amiga.d: partmap/amiga.c
 
 -include amiga_mod-partmap_amiga.d
 
-CLEANFILES += cmd-amiga.lst fs-amiga.lst
-COMMANDFILES += cmd-amiga.lst
-FSFILES += fs-amiga.lst
+CLEANFILES += cmd-amiga_mod-partmap_amiga.lst fs-amiga_mod-partmap_amiga.lst
+COMMANDFILES += cmd-amiga_mod-partmap_amiga.lst
+FSFILES += fs-amiga_mod-partmap_amiga.lst
 
-cmd-amiga.lst: partmap/amiga.c gencmdlist.sh
+cmd-amiga_mod-partmap_amiga.lst: partmap/amiga.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh amiga > $@ || (rm -f $@; exit 1)
 
-fs-amiga.lst: partmap/amiga.c genfslist.sh
+fs-amiga_mod-partmap_amiga.lst: partmap/amiga.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(amiga_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh amiga > $@ || (rm -f $@; exit 1)
 
 
@@ -1586,14 +1584,14 @@ apple_mod-partmap_apple.d: partmap/apple.c
 
 -include apple_mod-partmap_apple.d
 
-CLEANFILES += cmd-apple.lst fs-apple.lst
-COMMANDFILES += cmd-apple.lst
-FSFILES += fs-apple.lst
+CLEANFILES += cmd-apple_mod-partmap_apple.lst fs-apple_mod-partmap_apple.lst
+COMMANDFILES += cmd-apple_mod-partmap_apple.lst
+FSFILES += fs-apple_mod-partmap_apple.lst
 
-cmd-apple.lst: partmap/apple.c gencmdlist.sh
+cmd-apple_mod-partmap_apple.lst: partmap/apple.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh apple > $@ || (rm -f $@; exit 1)
 
-fs-apple.lst: partmap/apple.c genfslist.sh
+fs-apple_mod-partmap_apple.lst: partmap/apple.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(apple_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh apple > $@ || (rm -f $@; exit 1)
 
 
@@ -1637,14 +1635,14 @@ pc_mod-partmap_pc.d: partmap/pc.c
 
 -include pc_mod-partmap_pc.d
 
-CLEANFILES += cmd-pc.lst fs-pc.lst
-COMMANDFILES += cmd-pc.lst
-FSFILES += fs-pc.lst
+CLEANFILES += cmd-pc_mod-partmap_pc.lst fs-pc_mod-partmap_pc.lst
+COMMANDFILES += cmd-pc_mod-partmap_pc.lst
+FSFILES += fs-pc_mod-partmap_pc.lst
 
-cmd-pc.lst: partmap/pc.c gencmdlist.sh
+cmd-pc_mod-partmap_pc.lst: partmap/pc.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh pc > $@ || (rm -f $@; exit 1)
 
-fs-pc.lst: partmap/pc.c genfslist.sh
+fs-pc_mod-partmap_pc.lst: partmap/pc.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(pc_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh pc > $@ || (rm -f $@; exit 1)
 
 
@@ -1688,14 +1686,14 @@ sun_mod-partmap_sun.d: partmap/sun.c
 
 -include sun_mod-partmap_sun.d
 
-CLEANFILES += cmd-sun.lst fs-sun.lst
-COMMANDFILES += cmd-sun.lst
-FSFILES += fs-sun.lst
+CLEANFILES += cmd-sun_mod-partmap_sun.lst fs-sun_mod-partmap_sun.lst
+COMMANDFILES += cmd-sun_mod-partmap_sun.lst
+FSFILES += fs-sun_mod-partmap_sun.lst
 
-cmd-sun.lst: partmap/sun.c gencmdlist.sh
+cmd-sun_mod-partmap_sun.lst: partmap/sun.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh sun > $@ || (rm -f $@; exit 1)
 
-fs-sun.lst: partmap/sun.c genfslist.sh
+fs-sun_mod-partmap_sun.lst: partmap/sun.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(sun_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh sun > $@ || (rm -f $@; exit 1)
 
 
@@ -1739,14 +1737,14 @@ acorn_mod-partmap_acorn.d: partmap/acorn.c
 
 -include acorn_mod-partmap_acorn.d
 
-CLEANFILES += cmd-acorn.lst fs-acorn.lst
-COMMANDFILES += cmd-acorn.lst
-FSFILES += fs-acorn.lst
+CLEANFILES += cmd-acorn_mod-partmap_acorn.lst fs-acorn_mod-partmap_acorn.lst
+COMMANDFILES += cmd-acorn_mod-partmap_acorn.lst
+FSFILES += fs-acorn_mod-partmap_acorn.lst
 
-cmd-acorn.lst: partmap/acorn.c gencmdlist.sh
+cmd-acorn_mod-partmap_acorn.lst: partmap/acorn.c gencmdlist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh acorn > $@ || (rm -f $@; exit 1)
 
-fs-acorn.lst: partmap/acorn.c genfslist.sh
+fs-acorn_mod-partmap_acorn.lst: partmap/acorn.c genfslist.sh
 	set -e; 	  $(CC) -Ipartmap -I$(srcdir)/partmap $(CPPFLAGS) $(CFLAGS) $(acorn_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh acorn > $@ || (rm -f $@; exit 1)
 
 
@@ -1789,14 +1787,14 @@ loopback_mod-disk_loopback.d: disk/loopback.c
 
 -include loopback_mod-disk_loopback.d
 
-CLEANFILES += cmd-loopback.lst fs-loopback.lst
-COMMANDFILES += cmd-loopback.lst
-FSFILES += fs-loopback.lst
+CLEANFILES += cmd-loopback_mod-disk_loopback.lst fs-loopback_mod-disk_loopback.lst
+COMMANDFILES += cmd-loopback_mod-disk_loopback.lst
+FSFILES += fs-loopback_mod-disk_loopback.lst
 
-cmd-loopback.lst: disk/loopback.c gencmdlist.sh
+cmd-loopback_mod-disk_loopback.lst: disk/loopback.c gencmdlist.sh
 	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh loopback > $@ || (rm -f $@; exit 1)
 
-fs-loopback.lst: disk/loopback.c genfslist.sh
+fs-loopback_mod-disk_loopback.lst: disk/loopback.c genfslist.sh
 	set -e; 	  $(CC) -Idisk -I$(srcdir)/disk $(CPPFLAGS) $(CFLAGS) $(loopback_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh loopback > $@ || (rm -f $@; exit 1)
 
 
@@ -1840,14 +1838,14 @@ suspend_mod-commands_ieee1275_suspend.d: commands/ieee1275/suspend.c
 
 -include suspend_mod-commands_ieee1275_suspend.d
 
-CLEANFILES += cmd-suspend.lst fs-suspend.lst
-COMMANDFILES += cmd-suspend.lst
-FSFILES += fs-suspend.lst
+CLEANFILES += cmd-suspend_mod-commands_ieee1275_suspend.lst fs-suspend_mod-commands_ieee1275_suspend.lst
+COMMANDFILES += cmd-suspend_mod-commands_ieee1275_suspend.lst
+FSFILES += fs-suspend_mod-commands_ieee1275_suspend.lst
 
-cmd-suspend.lst: commands/ieee1275/suspend.c gencmdlist.sh
+cmd-suspend_mod-commands_ieee1275_suspend.lst: commands/ieee1275/suspend.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(suspend_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh suspend > $@ || (rm -f $@; exit 1)
 
-fs-suspend.lst: commands/ieee1275/suspend.c genfslist.sh
+fs-suspend_mod-commands_ieee1275_suspend.lst: commands/ieee1275/suspend.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(suspend_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh suspend > $@ || (rm -f $@; exit 1)
 
 
@@ -1891,14 +1889,14 @@ reboot_mod-commands_ieee1275_reboot.d: commands/ieee1275/reboot.c
 
 -include reboot_mod-commands_ieee1275_reboot.d
 
-CLEANFILES += cmd-reboot.lst fs-reboot.lst
-COMMANDFILES += cmd-reboot.lst
-FSFILES += fs-reboot.lst
+CLEANFILES += cmd-reboot_mod-commands_ieee1275_reboot.lst fs-reboot_mod-commands_ieee1275_reboot.lst
+COMMANDFILES += cmd-reboot_mod-commands_ieee1275_reboot.lst
+FSFILES += fs-reboot_mod-commands_ieee1275_reboot.lst
 
-cmd-reboot.lst: commands/ieee1275/reboot.c gencmdlist.sh
+cmd-reboot_mod-commands_ieee1275_reboot.lst: commands/ieee1275/reboot.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(reboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh reboot > $@ || (rm -f $@; exit 1)
 
-fs-reboot.lst: commands/ieee1275/reboot.c genfslist.sh
+fs-reboot_mod-commands_ieee1275_reboot.lst: commands/ieee1275/reboot.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(reboot_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh reboot > $@ || (rm -f $@; exit 1)
 
 
@@ -1942,14 +1940,14 @@ halt_mod-commands_ieee1275_halt.d: commands/ieee1275/halt.c
 
 -include halt_mod-commands_ieee1275_halt.d
 
-CLEANFILES += cmd-halt.lst fs-halt.lst
-COMMANDFILES += cmd-halt.lst
-FSFILES += fs-halt.lst
+CLEANFILES += cmd-halt_mod-commands_ieee1275_halt.lst fs-halt_mod-commands_ieee1275_halt.lst
+COMMANDFILES += cmd-halt_mod-commands_ieee1275_halt.lst
+FSFILES += fs-halt_mod-commands_ieee1275_halt.lst
 
-cmd-halt.lst: commands/ieee1275/halt.c gencmdlist.sh
+cmd-halt_mod-commands_ieee1275_halt.lst: commands/ieee1275/halt.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(halt_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh halt > $@ || (rm -f $@; exit 1)
 
-fs-halt.lst: commands/ieee1275/halt.c genfslist.sh
+fs-halt_mod-commands_ieee1275_halt.lst: commands/ieee1275/halt.c genfslist.sh
 	set -e; 	  $(CC) -Icommands/ieee1275 -I$(srcdir)/commands/ieee1275 $(CPPFLAGS) $(CFLAGS) $(halt_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh halt > $@ || (rm -f $@; exit 1)
 
 
@@ -1993,14 +1991,14 @@ help_mod-commands_help.d: commands/help.c
 
 -include help_mod-commands_help.d
 
-CLEANFILES += cmd-help.lst fs-help.lst
-COMMANDFILES += cmd-help.lst
-FSFILES += fs-help.lst
+CLEANFILES += cmd-help_mod-commands_help.lst fs-help_mod-commands_help.lst
+COMMANDFILES += cmd-help_mod-commands_help.lst
+FSFILES += fs-help_mod-commands_help.lst
 
-cmd-help.lst: commands/help.c gencmdlist.sh
+cmd-help_mod-commands_help.lst: commands/help.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh help > $@ || (rm -f $@; exit 1)
 
-fs-help.lst: commands/help.c genfslist.sh
+fs-help_mod-commands_help.lst: commands/help.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(help_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh help > $@ || (rm -f $@; exit 1)
 
 
@@ -2044,14 +2042,14 @@ default_mod-commands_default.d: commands/default.c
 
 -include default_mod-commands_default.d
 
-CLEANFILES += cmd-default.lst fs-default.lst
-COMMANDFILES += cmd-default.lst
-FSFILES += fs-default.lst
+CLEANFILES += cmd-default_mod-commands_default.lst fs-default_mod-commands_default.lst
+COMMANDFILES += cmd-default_mod-commands_default.lst
+FSFILES += fs-default_mod-commands_default.lst
 
-cmd-default.lst: commands/default.c gencmdlist.sh
+cmd-default_mod-commands_default.lst: commands/default.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh default > $@ || (rm -f $@; exit 1)
 
-fs-default.lst: commands/default.c genfslist.sh
+fs-default_mod-commands_default.lst: commands/default.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(default_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh default > $@ || (rm -f $@; exit 1)
 
 
@@ -2095,14 +2093,14 @@ timeout_mod-commands_timeout.d: commands/timeout.c
 
 -include timeout_mod-commands_timeout.d
 
-CLEANFILES += cmd-timeout.lst fs-timeout.lst
-COMMANDFILES += cmd-timeout.lst
-FSFILES += fs-timeout.lst
+CLEANFILES += cmd-timeout_mod-commands_timeout.lst fs-timeout_mod-commands_timeout.lst
+COMMANDFILES += cmd-timeout_mod-commands_timeout.lst
+FSFILES += fs-timeout_mod-commands_timeout.lst
 
-cmd-timeout.lst: commands/timeout.c gencmdlist.sh
+cmd-timeout_mod-commands_timeout.lst: commands/timeout.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh timeout > $@ || (rm -f $@; exit 1)
 
-fs-timeout.lst: commands/timeout.c genfslist.sh
+fs-timeout_mod-commands_timeout.lst: commands/timeout.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(timeout_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh timeout > $@ || (rm -f $@; exit 1)
 
 
@@ -2146,14 +2144,14 @@ configfile_mod-commands_configfile.d: commands/configfile.c
 
 -include configfile_mod-commands_configfile.d
 
-CLEANFILES += cmd-configfile.lst fs-configfile.lst
-COMMANDFILES += cmd-configfile.lst
-FSFILES += fs-configfile.lst
+CLEANFILES += cmd-configfile_mod-commands_configfile.lst fs-configfile_mod-commands_configfile.lst
+COMMANDFILES += cmd-configfile_mod-commands_configfile.lst
+FSFILES += fs-configfile_mod-commands_configfile.lst
 
-cmd-configfile.lst: commands/configfile.c gencmdlist.sh
+cmd-configfile_mod-commands_configfile.lst: commands/configfile.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh configfile > $@ || (rm -f $@; exit 1)
 
-fs-configfile.lst: commands/configfile.c genfslist.sh
+fs-configfile_mod-commands_configfile.lst: commands/configfile.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(configfile_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh configfile > $@ || (rm -f $@; exit 1)
 
 
@@ -2197,14 +2195,14 @@ search_mod-commands_search.d: commands/search.c
 
 -include search_mod-commands_search.d
 
-CLEANFILES += cmd-search.lst fs-search.lst
-COMMANDFILES += cmd-search.lst
-FSFILES += fs-search.lst
+CLEANFILES += cmd-search_mod-commands_search.lst fs-search_mod-commands_search.lst
+COMMANDFILES += cmd-search_mod-commands_search.lst
+FSFILES += fs-search_mod-commands_search.lst
 
-cmd-search.lst: commands/search.c gencmdlist.sh
+cmd-search_mod-commands_search.lst: commands/search.c gencmdlist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -E $< 	  | sh $(srcdir)/gencmdlist.sh search > $@ || (rm -f $@; exit 1)
 
-fs-search.lst: commands/search.c genfslist.sh
+fs-search_mod-commands_search.lst: commands/search.c genfslist.sh
 	set -e; 	  $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(search_mod_CFLAGS) -E $< 	  | sh $(srcdir)/genfslist.sh search > $@ || (rm -f $@; exit 1)
 
 
@@ -2248,14 +2246,14 @@ gzio_mod-io_gzio.d: io/gzio.c
 
 -include gzio_mod-io_gzio.d
 
-CLEANFILES += cmd-gzio.lst fs-gzio.lst
-COMMANDFILES += cmd-gzio.lst
-FSFILES += fs-gzio.lst
+CLEANFILES += cmd-gzio_mod-io_gzio.lst fs-gzio_mod-io_gzio.lst
+COMMANDFILES += cmd-gzio_mod-io_gzio.lst
+FSFILES += fs-gzio_mod-io_gzio.lst
 
-cmd-gzio.lst: io/gzio.c gencmdlist.sh
+cmd-gzio_mod-io_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
+fs-gzio_mod-io_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)
 
 
@@ -2266,14 +2264,3 @@ gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
 test_mod_SOURCES = commands/test.c
 test_mod_CFLAGS = $(COMMON_CFLAGS)
 test_mod_LDFLAGS = $(COMMON_LDFLAGS)
-CLEANFILES += moddep.lst command.lst fs.lst
-pkgdata_DATA += moddep.lst command.lst fs.lst
-moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
-	cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
-	  || (rm -f $@; exit 1)
-
-command.lst: $(COMMANDFILES)
-	cat $^ /dev/null | sort > $@
-
-fs.lst: $(FSFILES)
-	cat $^ /dev/null | sort > $@
diff --git a/genmk.rb b/genmk.rb
index 236ea5a31..3471f1436 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -141,8 +141,8 @@ UNDSYMFILES += #{undsym}
 " + objs.collect_with_index do |obj, i|
       src = sources[i]
       fake_obj = File.basename(src).suffix('o')
-      command = 'cmd-' + fake_obj.suffix('lst')
-      fs = 'fs-' + fake_obj.suffix('lst')
+      command = 'cmd-' + obj.suffix('lst')
+      fs = 'fs-' + obj.suffix('lst')
       dep = deps[i]
       flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
       dir = File.dirname(src)
@@ -314,7 +314,7 @@ while l = gets
   unless cont
     s.gsub!(/\\\n/, ' ')
     
-    if /^([a-zA-Z0-9_]+)\s*=\s*(.*?)\s*$/ =~ s
+    if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ s
       var, args = $1, $2
 
       if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/
@@ -367,14 +367,3 @@ while l = gets
   
 end
 
-puts "CLEANFILES += moddep.lst command.lst fs.lst"
-puts "pkgdata_DATA += moddep.lst command.lst fs.lst"
-puts "moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep"
-puts "	cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \\"
-puts "	  || (rm -f $@; exit 1)"
-puts ""
-puts "command.lst: $(COMMANDFILES)"
-puts "	cat $^ /dev/null | sort > $@"
-puts ""
-puts "fs.lst: $(FSFILES)"
-puts "	cat $^ /dev/null | sort > $@"