From 7b1f4b5715c7ce191b66cea89541a58838955522 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Wed, 2 Mar 2005 21:52:38 +0000
Subject: [PATCH] 2005-03-02  Yoshinori K. Okuji  <okuji@enbug.org>

  * gencmdlist.sh: New file.

  * genmk.rb (PModule::rule): Generate a rule for a command list.
  Clean command.lst.
  Generate command.lst from $(COMMANDFILES).

  * Makefile.in (COMMON_DISTFILES): Added gencmdlist.sh.
  (DATA): Added $(pkgdata_DATA).
  (install-local): Install files in $(pkgdata_DATA).
---
 ChangeLog                |  12 ++
 Makefile.in              |  12 +-
 conf/i386-pc.mk          | 247 ++++++++++++++++++++++++++++++++++++++-
 conf/powerpc-ieee1275.mk | 223 ++++++++++++++++++++++++++++++++++-
 gencmdlist.sh            |  18 +++
 genmk.rb                 |  16 ++-
 6 files changed, 517 insertions(+), 11 deletions(-)
 create mode 100644 gencmdlist.sh

diff --git a/ChangeLog b/ChangeLog
index 8aec27615..b83bdcf16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-02  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* gencmdlist.sh: New file.
+	
+	* genmk.rb (PModule::rule): Generate a rule for a command list.
+	Clean command.lst.
+	Generate command.lst from $(COMMANDFILES).
+
+	* Makefile.in (COMMON_DISTFILES): Added gencmdlist.sh.
+	(DATA): Added $(pkgdata_DATA).
+	(install-local): Install files in $(pkgdata_DATA).
+
 2005-03-02  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* term/i386/pc/vga.c (debug_command): Removed.
diff --git a/Makefile.in b/Makefile.in
index b55250281..4ff6a5c1f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,9 +74,9 @@ MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
 
 COMMON_DISTFILES = AUTHORS COPYING ChangeLog INSTALL NEWS README \
 	THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \
-	config.h.in config.sub configure configure.ac genkernsyms.sh \
-	genmk.rb genmodsrc.sh gensymlist.sh install-sh mkinstalldirs \
-	stamp-h.in
+	config.h.in config.sub configure configure.ac gencmdlist.sh \
+	genkernsyms.sh genmk.rb genmodsrc.sh gensymlist.sh install-sh \
+	mkinstalldirs stamp-h.in
 
 BOOT_DISTFILES = $(addprefix boot/i386/pc/,boot.S diskboot.S)
 
@@ -113,7 +113,8 @@ DISTFILES = $(COMMON_DISTFILES) $(BOOT_DISTFILES) $(CONF_DISTFILES) \
 	$(KERN_DISTFILES) $(LOADER_DISTFILES) $(TERM_DISTFILES) \
 	$(UTIL_DISTFILES)
 
-DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS)
+DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS) \
+	$(pkgdata_DATA)
 PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
 SCRIPTS = 
 
@@ -144,7 +145,8 @@ install: install-local
 
 install-local: all
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-	@list='$(pkgdata_IMAGES) $(pkgdata_MODULES)'; for file in $$list; do \
+	@list='$(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_DATA)'; \
+	for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,'`"; \
 	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkgdatadir)/$$dest; \
diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk
index 99421463c..f4ee07ade 100644
--- a/conf/i386-pc.mk
+++ b/conf/i386-pc.mk
@@ -992,6 +992,12 @@ _chain_mod-loader_i386_pc_chainloader.d: loader/i386/pc/chainloader.c
 
 -include _chain_mod-loader_i386_pc_chainloader.d
 
+CLEANFILES += cmd-chainloader.lst
+COMMANDFILES += cmd-chainloader.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 _chain_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For chain.mod.
@@ -1031,6 +1037,12 @@ 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
+COMMANDFILES += cmd-chainloader_normal.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 chain_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For fshelp.mod.
@@ -1070,6 +1082,12 @@ fshelp_mod-fs_fshelp.d: fs/fshelp.c
 
 -include fshelp_mod-fs_fshelp.d
 
+CLEANFILES += cmd-fshelp.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For fat.mod.
@@ -1109,6 +1127,12 @@ fat_mod-fs_fat.d: fs/fat.c
 
 -include fat_mod-fs_fat.d
 
+CLEANFILES += cmd-fat.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 fat_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For ext2.mod.
@@ -1148,6 +1172,12 @@ ext2_mod-fs_ext2.d: fs/ext2.c
 
 -include ext2_mod-fs_ext2.d
 
+CLEANFILES += cmd-ext2.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 ext2_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For ufs.mod.
@@ -1187,6 +1217,12 @@ ufs_mod-fs_ufs.d: fs/ufs.c
 
 -include ufs_mod-fs_ufs.d
 
+CLEANFILES += cmd-ufs.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 ufs_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For minix.mod.
@@ -1226,6 +1262,12 @@ minix_mod-fs_minix.d: fs/minix.c
 
 -include minix_mod-fs_minix.d
 
+CLEANFILES += cmd-minix.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 minix_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For hfs.mod.
@@ -1265,6 +1307,12 @@ hfs_mod-fs_hfs.d: fs/hfs.c
 
 -include hfs_mod-fs_hfs.d
 
+CLEANFILES += cmd-hfs.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 hfs_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For jfs.mod.
@@ -1304,6 +1352,12 @@ jfs_mod-fs_jfs.d: fs/jfs.c
 
 -include jfs_mod-fs_jfs.d
 
+CLEANFILES += cmd-jfs.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 jfs_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For iso9660.mod.
@@ -1347,6 +1401,12 @@ _linux_mod-loader_i386_pc_linux.d: loader/i386/pc/linux.c
 
 -include _linux_mod-loader_i386_pc_linux.d
 
+CLEANFILES += cmd-linux.lst
+COMMANDFILES += cmd-linux.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 _linux_mod_CFLAGS = $(COMMON_CFLAGS)
  
 # For linux.mod.
@@ -1386,6 +1446,12 @@ 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
+COMMANDFILES += cmd-linux_normal.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For normal.mod.
@@ -1427,6 +1493,12 @@ normal_mod-normal_arg.d: normal/arg.c
 
 -include normal_mod-normal_arg.d
 
+CLEANFILES += cmd-arg.lst
+COMMANDFILES += cmd-arg.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_cmdline.o: normal/cmdline.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1435,6 +1507,12 @@ normal_mod-normal_cmdline.d: normal/cmdline.c
 
 -include normal_mod-normal_cmdline.d
 
+CLEANFILES += cmd-cmdline.lst
+COMMANDFILES += cmd-cmdline.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_command.o: normal/command.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1443,6 +1521,12 @@ normal_mod-normal_command.d: normal/command.c
 
 -include normal_mod-normal_command.d
 
+CLEANFILES += cmd-command.lst
+COMMANDFILES += cmd-command.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_context.o: normal/context.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1451,6 +1535,12 @@ normal_mod-normal_context.d: normal/context.c
 
 -include normal_mod-normal_context.d
 
+CLEANFILES += cmd-context.lst
+COMMANDFILES += cmd-context.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_main.o: normal/main.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1459,6 +1549,12 @@ normal_mod-normal_main.d: normal/main.c
 
 -include normal_mod-normal_main.d
 
+CLEANFILES += cmd-main.lst
+COMMANDFILES += cmd-main.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_menu.o: normal/menu.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1467,6 +1563,12 @@ normal_mod-normal_menu.d: normal/menu.c
 
 -include normal_mod-normal_menu.d
 
+CLEANFILES += cmd-menu.lst
+COMMANDFILES += cmd-menu.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_menu_entry.o: normal/menu_entry.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1475,6 +1577,12 @@ normal_mod-normal_menu_entry.d: normal/menu_entry.c
 
 -include normal_mod-normal_menu_entry.d
 
+CLEANFILES += cmd-menu_entry.lst
+COMMANDFILES += cmd-menu_entry.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_i386_setjmp.o: normal/i386/setjmp.S
 	$(CC) -Inormal/i386 -I$(srcdir)/normal/i386 $(CPPFLAGS) $(ASFLAGS) $(normal_mod_ASFLAGS) -c -o $@ $<
 
@@ -1483,6 +1591,12 @@ normal_mod-normal_i386_setjmp.d: normal/i386/setjmp.S
 
 -include normal_mod-normal_i386_setjmp.d
 
+CLEANFILES += cmd-setjmp.lst
+COMMANDFILES += cmd-setjmp.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
@@ -1523,6 +1637,12 @@ hello_mod-hello_hello.d: hello/hello.c
 
 -include hello_mod-hello_hello.d
 
+CLEANFILES += cmd-hello.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 hello_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For boot.mod.
@@ -1562,6 +1682,12 @@ boot_mod-commands_boot.d: commands/boot.c
 
 -include boot_mod-commands_boot.d
 
+CLEANFILES += cmd-boot.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 boot_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For terminal.mod.
@@ -1601,6 +1727,12 @@ terminal_mod-commands_terminal.d: commands/terminal.c
 
 -include terminal_mod-commands_terminal.d
 
+CLEANFILES += cmd-terminal.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 terminal_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For ls.mod.
@@ -1640,6 +1772,12 @@ ls_mod-commands_ls.d: commands/ls.c
 
 -include ls_mod-commands_ls.d
 
+CLEANFILES += cmd-ls.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 ls_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For cmp.mod.
@@ -1679,6 +1817,12 @@ cmp_mod-commands_cmp.d: commands/cmp.c
 
 -include cmp_mod-commands_cmp.d
 
+CLEANFILES += cmd-cmp.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 cmp_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For cat.mod.
@@ -1718,6 +1862,12 @@ cat_mod-commands_cat.d: commands/cat.c
 
 -include cat_mod-commands_cat.d
 
+CLEANFILES += cmd-cat.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 cat_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For help.mod.
@@ -1757,6 +1907,12 @@ help_mod-commands_help.d: commands/help.c
 
 -include help_mod-commands_help.d
 
+CLEANFILES += cmd-help.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 help_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For reboot.mod.
@@ -1796,6 +1952,12 @@ reboot_mod-commands_i386_pc_reboot.d: commands/i386/pc/reboot.c
 
 -include reboot_mod-commands_i386_pc_reboot.d
 
+CLEANFILES += cmd-reboot.lst
+COMMANDFILES += cmd-reboot.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 reboot_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For halt.mod.
@@ -1835,6 +1997,12 @@ halt_mod-commands_i386_pc_halt.d: commands/i386/pc/halt.c
 
 -include halt_mod-commands_i386_pc_halt.d
 
+CLEANFILES += cmd-halt.lst
+COMMANDFILES += cmd-halt.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For vga.mod.
@@ -1874,6 +2042,12 @@ vga_mod-term_i386_pc_vga.d: term/i386/pc/vga.c
 
 -include vga_mod-term_i386_pc_vga.d
 
+CLEANFILES += cmd-vga.lst
+COMMANDFILES += cmd-vga.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 vga_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For font.mod.
@@ -1913,6 +2087,12 @@ font_mod-font_manager.d: font/manager.c
 
 -include font_mod-font_manager.d
 
+CLEANFILES += cmd-manager.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 font_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For _multiboot.mod.
@@ -1952,6 +2132,12 @@ _multiboot_mod-loader_i386_pc_multiboot.d: loader/i386/pc/multiboot.c
 
 -include _multiboot_mod-loader_i386_pc_multiboot.d
 
+CLEANFILES += cmd-multiboot.lst
+COMMANDFILES += cmd-multiboot.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 _multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For multiboot.mod.
@@ -1991,6 +2177,12 @@ 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
+COMMANDFILES += cmd-multiboot_normal.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For amiga.mod
@@ -2030,6 +2222,12 @@ amiga_mod-partmap_amiga.d: partmap/amiga.c
 
 -include amiga_mod-partmap_amiga.d
 
+CLEANFILES += cmd-amiga.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 amiga_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For apple.mod
@@ -2069,6 +2267,12 @@ apple_mod-partmap_apple.d: partmap/apple.c
 
 -include apple_mod-partmap_apple.d
 
+CLEANFILES += cmd-apple.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 apple_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For pc.mod
@@ -2108,6 +2312,12 @@ pc_mod-partmap_pc.d: partmap/pc.c
 
 -include pc_mod-partmap_pc.d
 
+CLEANFILES += cmd-pc.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 pc_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For sun.mod
@@ -2147,6 +2357,12 @@ sun_mod-partmap_sun.d: partmap/sun.c
 
 -include sun_mod-partmap_sun.d
 
+CLEANFILES += cmd-sun.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 sun_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For loopback.mod
@@ -2186,6 +2402,12 @@ loopback_mod-disk_loopback.d: disk/loopback.c
 
 -include loopback_mod-disk_loopback.d
 
+CLEANFILES += cmd-loopback.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 loopback_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For default.mod
@@ -2225,6 +2447,12 @@ default_mod-commands_default.d: commands/default.c
 
 -include default_mod-commands_default.d
 
+CLEANFILES += cmd-default.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 default_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For timeout.mod
@@ -2264,6 +2492,12 @@ timeout_mod-commands_timeout.d: commands/timeout.c
 
 -include timeout_mod-commands_timeout.d
 
+CLEANFILES += cmd-timeout.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 timeout_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For configfile.mod
@@ -2303,9 +2537,18 @@ configfile_mod-commands_configfile.d: commands/configfile.c
 
 -include configfile_mod-commands_configfile.d
 
+CLEANFILES += cmd-configfile.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-CLEANFILES += moddep.lst
-pkgdata_DATA += moddep.lst
+CLEANFILES += moddep.lst command.lst
+pkgdata_DATA += moddep.lst command.lst
 moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
 	cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
 	  || (rm -f $@; exit 1)
+
+command.lst: $(COMMANDFILES)
+	cat $^ /dev/null | sort > $@
diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index 111a94136..bbce339fa 100644
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -759,6 +759,12 @@ fshelp_mod-fs_fshelp.d: fs/fshelp.c
 
 -include fshelp_mod-fs_fshelp.d
 
+CLEANFILES += cmd-fshelp.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For fat.mod.
@@ -798,6 +804,12 @@ fat_mod-fs_fat.d: fs/fat.c
 
 -include fat_mod-fs_fat.d
 
+CLEANFILES += cmd-fat.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 fat_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For ext2.mod.
@@ -837,6 +849,12 @@ ext2_mod-fs_ext2.d: fs/ext2.c
 
 -include ext2_mod-fs_ext2.d
 
+CLEANFILES += cmd-ext2.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 ext2_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For ufs.mod.
@@ -876,6 +894,12 @@ ufs_mod-fs_ufs.d: fs/ufs.c
 
 -include ufs_mod-fs_ufs.d
 
+CLEANFILES += cmd-ufs.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 ufs_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For minix.mod.
@@ -915,6 +939,12 @@ minix_mod-fs_minix.d: fs/minix.c
 
 -include minix_mod-fs_minix.d
 
+CLEANFILES += cmd-minix.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 minix_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For hfs.mod.
@@ -954,6 +984,12 @@ hfs_mod-fs_hfs.d: fs/hfs.c
 
 -include hfs_mod-fs_hfs.d
 
+CLEANFILES += cmd-hfs.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 hfs_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For jfs.mod.
@@ -993,6 +1029,12 @@ jfs_mod-fs_jfs.d: fs/jfs.c
 
 -include jfs_mod-fs_jfs.d
 
+CLEANFILES += cmd-jfs.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 jfs_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For iso9660.mod.
@@ -1036,6 +1078,12 @@ _linux_mod-loader_powerpc_ieee1275_linux.d: loader/powerpc/ieee1275/linux.c
 
 -include _linux_mod-loader_powerpc_ieee1275_linux.d
 
+CLEANFILES += cmd-linux.lst
+COMMANDFILES += cmd-linux.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 _linux_mod_CFLAGS = $(COMMON_CFLAGS)
  
 # For linux.mod.
@@ -1075,6 +1123,12 @@ 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
+COMMANDFILES += cmd-linux_normal.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For normal.mod.
@@ -1117,6 +1171,12 @@ normal_mod-normal_arg.d: normal/arg.c
 
 -include normal_mod-normal_arg.d
 
+CLEANFILES += cmd-arg.lst
+COMMANDFILES += cmd-arg.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_cmdline.o: normal/cmdline.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1125,6 +1185,12 @@ normal_mod-normal_cmdline.d: normal/cmdline.c
 
 -include normal_mod-normal_cmdline.d
 
+CLEANFILES += cmd-cmdline.lst
+COMMANDFILES += cmd-cmdline.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_command.o: normal/command.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1133,6 +1199,12 @@ normal_mod-normal_command.d: normal/command.c
 
 -include normal_mod-normal_command.d
 
+CLEANFILES += cmd-command.lst
+COMMANDFILES += cmd-command.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_context.o: normal/context.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1141,6 +1213,12 @@ normal_mod-normal_context.d: normal/context.c
 
 -include normal_mod-normal_context.d
 
+CLEANFILES += cmd-context.lst
+COMMANDFILES += cmd-context.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_main.o: normal/main.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1149,6 +1227,12 @@ normal_mod-normal_main.d: normal/main.c
 
 -include normal_mod-normal_main.d
 
+CLEANFILES += cmd-main.lst
+COMMANDFILES += cmd-main.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_menu.o: normal/menu.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1157,6 +1241,12 @@ normal_mod-normal_menu.d: normal/menu.c
 
 -include normal_mod-normal_menu.d
 
+CLEANFILES += cmd-menu.lst
+COMMANDFILES += cmd-menu.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_menu_entry.o: normal/menu_entry.c
 	$(CC) -Inormal -I$(srcdir)/normal $(CPPFLAGS) $(CFLAGS) $(normal_mod_CFLAGS) -c -o $@ $<
 
@@ -1165,6 +1255,12 @@ normal_mod-normal_menu_entry.d: normal/menu_entry.c
 
 -include normal_mod-normal_menu_entry.d
 
+CLEANFILES += cmd-menu_entry.lst
+COMMANDFILES += cmd-menu_entry.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod-normal_powerpc_setjmp.o: normal/powerpc/setjmp.S
 	$(CC) -Inormal/powerpc -I$(srcdir)/normal/powerpc $(CPPFLAGS) $(ASFLAGS) $(normal_mod_ASFLAGS) -c -o $@ $<
 
@@ -1173,6 +1269,12 @@ normal_mod-normal_powerpc_setjmp.d: normal/powerpc/setjmp.S
 
 -include normal_mod-normal_powerpc_setjmp.d
 
+CLEANFILES += cmd-setjmp.lst
+COMMANDFILES += cmd-setjmp.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
@@ -1213,6 +1315,12 @@ hello_mod-hello_hello.d: hello/hello.c
 
 -include hello_mod-hello_hello.d
 
+CLEANFILES += cmd-hello.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 hello_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For boot.mod.
@@ -1252,6 +1360,12 @@ boot_mod-commands_boot.d: commands/boot.c
 
 -include boot_mod-commands_boot.d
 
+CLEANFILES += cmd-boot.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 boot_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For terminal.mod.
@@ -1291,6 +1405,12 @@ terminal_mod-commands_terminal.d: commands/terminal.c
 
 -include terminal_mod-commands_terminal.d
 
+CLEANFILES += cmd-terminal.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 terminal_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For ls.mod.
@@ -1330,6 +1450,12 @@ ls_mod-commands_ls.d: commands/ls.c
 
 -include ls_mod-commands_ls.d
 
+CLEANFILES += cmd-ls.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 ls_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For cmp.mod.
@@ -1369,6 +1495,12 @@ cmp_mod-commands_cmp.d: commands/cmp.c
 
 -include cmp_mod-commands_cmp.d
 
+CLEANFILES += cmd-cmp.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 cmp_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For cat.mod.
@@ -1408,6 +1540,12 @@ cat_mod-commands_cat.d: commands/cat.c
 
 -include cat_mod-commands_cat.d
 
+CLEANFILES += cmd-cat.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 cat_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For font.mod.
@@ -1447,6 +1585,12 @@ font_mod-font_manager.d: font/manager.c
 
 -include font_mod-font_manager.d
 
+CLEANFILES += cmd-manager.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 font_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For amiga.mod
@@ -1486,6 +1630,12 @@ amiga_mod-partmap_amiga.d: partmap/amiga.c
 
 -include amiga_mod-partmap_amiga.d
 
+CLEANFILES += cmd-amiga.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 amiga_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For apple.mod
@@ -1525,6 +1675,12 @@ apple_mod-partmap_apple.d: partmap/apple.c
 
 -include apple_mod-partmap_apple.d
 
+CLEANFILES += cmd-apple.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 apple_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For pc.mod
@@ -1564,6 +1720,12 @@ pc_mod-partmap_pc.d: partmap/pc.c
 
 -include pc_mod-partmap_pc.d
 
+CLEANFILES += cmd-pc.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 pc_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For sun.mod
@@ -1603,6 +1765,12 @@ sun_mod-partmap_sun.d: partmap/sun.c
 
 -include sun_mod-partmap_sun.d
 
+CLEANFILES += cmd-sun.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 sun_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For loopback.mod
@@ -1642,6 +1810,12 @@ loopback_mod-disk_loopback.d: disk/loopback.c
 
 -include loopback_mod-disk_loopback.d
 
+CLEANFILES += cmd-loopback.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 loopback_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For suspend.mod
@@ -1681,6 +1855,12 @@ suspend_mod-commands_ieee1275_suspend.d: commands/ieee1275/suspend.c
 
 -include suspend_mod-commands_ieee1275_suspend.d
 
+CLEANFILES += cmd-suspend.lst
+COMMANDFILES += cmd-suspend.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 suspend_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For reboot.mod
@@ -1720,6 +1900,12 @@ reboot_mod-commands_ieee1275_reboot.d: commands/ieee1275/reboot.c
 
 -include reboot_mod-commands_ieee1275_reboot.d
 
+CLEANFILES += cmd-reboot.lst
+COMMANDFILES += cmd-reboot.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 reboot_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For halt.mod
@@ -1759,6 +1945,12 @@ halt_mod-commands_ieee1275_halt.d: commands/ieee1275/halt.c
 
 -include halt_mod-commands_ieee1275_halt.d
 
+CLEANFILES += cmd-halt.lst
+COMMANDFILES += cmd-halt.lst
+
+cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For help.mod.
@@ -1798,6 +1990,12 @@ help_mod-commands_help.d: commands/help.c
 
 -include help_mod-commands_help.d
 
+CLEANFILES += cmd-help.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 help_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For default.mod
@@ -1837,6 +2035,12 @@ default_mod-commands_default.d: commands/default.c
 
 -include default_mod-commands_default.d
 
+CLEANFILES += cmd-default.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 default_mod_CFLAGS =  $(COMMON_CFLAGS)
 
 # For timeout.mod
@@ -1876,6 +2080,12 @@ timeout_mod-commands_timeout.d: commands/timeout.c
 
 -include timeout_mod-commands_timeout.d
 
+CLEANFILES += cmd-timeout.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 timeout_mod_CFLAGS =  $(COMMON_CFLAGS)
 
 # For configfile.mod
@@ -1915,9 +2125,18 @@ configfile_mod-commands_configfile.d: commands/configfile.c
 
 -include configfile_mod-commands_configfile.d
 
+CLEANFILES += cmd-configfile.lst
+COMMANDFILES += cmd-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.mod > $@ || (rm -f $@; exit 1)
+
 configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-CLEANFILES += moddep.lst
-pkgdata_DATA += moddep.lst
+CLEANFILES += moddep.lst command.lst
+pkgdata_DATA += moddep.lst command.lst
 moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep
 	cat $(DEFSYMFILES) /dev/null | ./genmoddep $(UNDSYMFILES) > $@ \
 	  || (rm -f $@; exit 1)
+
+command.lst: $(COMMANDFILES)
+	cat $^ /dev/null | sort > $@
diff --git a/gencmdlist.sh b/gencmdlist.sh
new file mode 100644
index 000000000..d310ca661
--- /dev/null
+++ b/gencmdlist.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+#
+# Copyright (C) 2005  Free Software Foundation, Inc.
+#
+# This gensymlist.sh is free software; the author
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Read source code from stdin and detect command names.
+
+module=$1
+
+grep -v "^#" | sed -ne "/grub_register_command *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $module/;p}"
diff --git a/genmk.rb b/genmk.rb
index 94fe9b3d8..f967a443f 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -140,6 +140,7 @@ 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')
       dep = deps[i]
       flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
       dir = File.dirname(src)
@@ -155,6 +156,14 @@ UNDSYMFILES += #{undsym}
 
 -include #{dep}
 
+CLEANFILES += #{command}
+COMMANDFILES += #{command}
+
+#{command}: #{src} gencmdlist.sh
+	set -e; \
+	  $(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(#{flag}) $(#{prefix}_#{flag}) -E $< \
+	  | sh $(srcdir)/gencmdlist.sh #{@name} > $@ || (rm -f $@; exit 1)
+
 "
     end.join('')
   end
@@ -315,8 +324,11 @@ while l = gets
   
 end
 
-puts "CLEANFILES += moddep.lst"
-puts "pkgdata_DATA += moddep.lst"
+puts "CLEANFILES += moddep.lst command.lst"
+puts "pkgdata_DATA += moddep.lst command.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 > $@"
-- 
2.47.2