2006-06-02 Yoshinori K. Okuji <okuji@enbug.org>

        * conf/common.rmk (grub_modules_init.lst): Depended on
        grub_emu_SOURCES, excluding grub_emu_init.c, instead of
        MODSRCFILES.

        * genmk.rb (PModule::rule): Reverted the previous change.

diff --git a/ChangeLog b/ChangeLog
index e138fdd288fc2891aee80eceb36e99bae6ef9bb9..ea2c5b95e8fc522125b3dd8cc48180270a24dee6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-02  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * conf/common.rmk (grub_modules_init.lst): Depended on
+       grub_emu_SOURCES, excluding grub_emu_init.c, instead of
+       MODSRCFILES.
+
+       * genmk.rb (PModule::rule): Reverted the previous change.
+
 2006-06-02  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * conf/common.rmk (grub_modules_init.lst): Depends on

diff --git a/conf/common.mk b/conf/common.mk
index 031250ab947db66101001cfacb6394d4731ff56d..67ac2403389f349f0a54edda2fdd0344d2242db5 100644 (file)
--- a/conf/common.mk
+++ b/conf/common.mk
@@ -6,7 +6,7 @@ grub_script.tab.c grub_script.tab.h: normal/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
 
 # For grub-emu.
-grub_modules_init.lst: geninit.sh $(MODSRCFILES)
+grub_modules_init.lst: geninit.sh $(filter-out grub_emu_init.c,$(grub_emu_SOURCES))
        rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
 DISTCLEANFILES += grub_modules_init.lst
 
@@ -30,7 +30,6 @@ CLEANFILES += fshelp.mod mod-fshelp.o mod-fshelp.c pre-fshelp.o fshelp_mod-fs_fs
 ifneq ($(fshelp_mod_EXPORTS),no)
 CLEANFILES += def-fshelp.lst
 DEFSYMFILES += def-fshelp.lst
-MODSRCFILES += fs/fshelp.c
 endif
 MOSTLYCLEANFILES += fshelp_mod-fs_fshelp.d
 UNDSYMFILES += und-fshelp.lst
@@ -87,7 +86,6 @@ CLEANFILES += fat.mod mod-fat.o mod-fat.c pre-fat.o fat_mod-fs_fat.o und-fat.lst
 ifneq ($(fat_mod_EXPORTS),no)
 CLEANFILES += def-fat.lst
 DEFSYMFILES += def-fat.lst
-MODSRCFILES += fs/fat.c
 endif
 MOSTLYCLEANFILES += fat_mod-fs_fat.d
 UNDSYMFILES += und-fat.lst
@@ -144,7 +142,6 @@ CLEANFILES += ufs.mod mod-ufs.o mod-ufs.c pre-ufs.o ufs_mod-fs_ufs.o und-ufs.lst
 ifneq ($(ufs_mod_EXPORTS),no)
 CLEANFILES += def-ufs.lst
 DEFSYMFILES += def-ufs.lst
-MODSRCFILES += fs/ufs.c
 endif
 MOSTLYCLEANFILES += ufs_mod-fs_ufs.d
 UNDSYMFILES += und-ufs.lst
@@ -201,7 +198,6 @@ CLEANFILES += ext2.mod mod-ext2.o mod-ext2.c pre-ext2.o ext2_mod-fs_ext2.o und-e
 ifneq ($(ext2_mod_EXPORTS),no)
 CLEANFILES += def-ext2.lst
 DEFSYMFILES += def-ext2.lst
-MODSRCFILES += fs/ext2.c
 endif
 MOSTLYCLEANFILES += ext2_mod-fs_ext2.d
 UNDSYMFILES += und-ext2.lst
@@ -258,7 +254,6 @@ CLEANFILES += minix.mod mod-minix.o mod-minix.c pre-minix.o minix_mod-fs_minix.o
 ifneq ($(minix_mod_EXPORTS),no)
 CLEANFILES += def-minix.lst
 DEFSYMFILES += def-minix.lst
-MODSRCFILES += fs/minix.c
 endif
 MOSTLYCLEANFILES += minix_mod-fs_minix.d
 UNDSYMFILES += und-minix.lst
@@ -315,7 +310,6 @@ CLEANFILES += hfs.mod mod-hfs.o mod-hfs.c pre-hfs.o hfs_mod-fs_hfs.o und-hfs.lst
 ifneq ($(hfs_mod_EXPORTS),no)
 CLEANFILES += def-hfs.lst
 DEFSYMFILES += def-hfs.lst
-MODSRCFILES += fs/hfs.c
 endif
 MOSTLYCLEANFILES += hfs_mod-fs_hfs.d
 UNDSYMFILES += und-hfs.lst
@@ -372,7 +366,6 @@ CLEANFILES += jfs.mod mod-jfs.o mod-jfs.c pre-jfs.o jfs_mod-fs_jfs.o und-jfs.lst
 ifneq ($(jfs_mod_EXPORTS),no)
 CLEANFILES += def-jfs.lst
 DEFSYMFILES += def-jfs.lst
-MODSRCFILES += fs/jfs.c
 endif
 MOSTLYCLEANFILES += jfs_mod-fs_jfs.d
 UNDSYMFILES += und-jfs.lst
@@ -429,7 +422,6 @@ CLEANFILES += iso9660.mod mod-iso9660.o mod-iso9660.c pre-iso9660.o iso9660_mod-
 ifneq ($(iso9660_mod_EXPORTS),no)
 CLEANFILES += def-iso9660.lst
 DEFSYMFILES += def-iso9660.lst
-MODSRCFILES += fs/iso9660.c
 endif
 MOSTLYCLEANFILES += iso9660_mod-fs_iso9660.d
 UNDSYMFILES += und-iso9660.lst
@@ -486,7 +478,6 @@ CLEANFILES += xfs.mod mod-xfs.o mod-xfs.c pre-xfs.o xfs_mod-fs_xfs.o und-xfs.lst
 ifneq ($(xfs_mod_EXPORTS),no)
 CLEANFILES += def-xfs.lst
 DEFSYMFILES += def-xfs.lst
-MODSRCFILES += fs/xfs.c
 endif
 MOSTLYCLEANFILES += xfs_mod-fs_xfs.d
 UNDSYMFILES += und-xfs.lst
@@ -543,7 +534,6 @@ CLEANFILES += affs.mod mod-affs.o mod-affs.c pre-affs.o affs_mod-fs_affs.o und-a
 ifneq ($(affs_mod_EXPORTS),no)
 CLEANFILES += def-affs.lst
 DEFSYMFILES += def-affs.lst
-MODSRCFILES += fs/affs.c
 endif
 MOSTLYCLEANFILES += affs_mod-fs_affs.d
 UNDSYMFILES += und-affs.lst
@@ -600,7 +590,6 @@ CLEANFILES += sfs.mod mod-sfs.o mod-sfs.c pre-sfs.o sfs_mod-fs_sfs.o und-sfs.lst
 ifneq ($(sfs_mod_EXPORTS),no)
 CLEANFILES += def-sfs.lst
 DEFSYMFILES += def-sfs.lst
-MODSRCFILES += fs/sfs.c
 endif
 MOSTLYCLEANFILES += sfs_mod-fs_sfs.d
 UNDSYMFILES += und-sfs.lst
@@ -657,7 +646,6 @@ CLEANFILES += hfsplus.mod mod-hfsplus.o mod-hfsplus.c pre-hfsplus.o hfsplus_mod-
 ifneq ($(hfsplus_mod_EXPORTS),no)
 CLEANFILES += def-hfsplus.lst
 DEFSYMFILES += def-hfsplus.lst
-MODSRCFILES += fs/hfsplus.c
 endif
 MOSTLYCLEANFILES += hfsplus_mod-fs_hfsplus.d
 UNDSYMFILES += und-hfsplus.lst
@@ -717,7 +705,6 @@ CLEANFILES += amiga.mod mod-amiga.o mod-amiga.c pre-amiga.o amiga_mod-partmap_am
 ifneq ($(amiga_mod_EXPORTS),no)
 CLEANFILES += def-amiga.lst
 DEFSYMFILES += def-amiga.lst
-MODSRCFILES += partmap/amiga.c
 endif
 MOSTLYCLEANFILES += amiga_mod-partmap_amiga.d
 UNDSYMFILES += und-amiga.lst
@@ -774,7 +761,6 @@ CLEANFILES += apple.mod mod-apple.o mod-apple.c pre-apple.o apple_mod-partmap_ap
 ifneq ($(apple_mod_EXPORTS),no)
 CLEANFILES += def-apple.lst
 DEFSYMFILES += def-apple.lst
-MODSRCFILES += partmap/apple.c
 endif
 MOSTLYCLEANFILES += apple_mod-partmap_apple.d
 UNDSYMFILES += und-apple.lst
@@ -831,7 +817,6 @@ CLEANFILES += pc.mod mod-pc.o mod-pc.c pre-pc.o pc_mod-partmap_pc.o und-pc.lst
 ifneq ($(pc_mod_EXPORTS),no)
 CLEANFILES += def-pc.lst
 DEFSYMFILES += def-pc.lst
-MODSRCFILES += partmap/pc.c
 endif
 MOSTLYCLEANFILES += pc_mod-partmap_pc.d
 UNDSYMFILES += und-pc.lst
@@ -888,7 +873,6 @@ CLEANFILES += sun.mod mod-sun.o mod-sun.c pre-sun.o sun_mod-partmap_sun.o und-su
 ifneq ($(sun_mod_EXPORTS),no)
 CLEANFILES += def-sun.lst
 DEFSYMFILES += def-sun.lst
-MODSRCFILES += partmap/sun.c
 endif
 MOSTLYCLEANFILES += sun_mod-partmap_sun.d
 UNDSYMFILES += und-sun.lst
@@ -945,7 +929,6 @@ CLEANFILES += acorn.mod mod-acorn.o mod-acorn.c pre-acorn.o acorn_mod-partmap_ac
 ifneq ($(acorn_mod_EXPORTS),no)
 CLEANFILES += def-acorn.lst
 DEFSYMFILES += def-acorn.lst
-MODSRCFILES += partmap/acorn.c
 endif
 MOSTLYCLEANFILES += acorn_mod-partmap_acorn.d
 UNDSYMFILES += und-acorn.lst
@@ -1002,7 +985,6 @@ CLEANFILES += gpt.mod mod-gpt.o mod-gpt.c pre-gpt.o gpt_mod-partmap_gpt.o und-gp
 ifneq ($(gpt_mod_EXPORTS),no)
 CLEANFILES += def-gpt.lst
 DEFSYMFILES += def-gpt.lst
-MODSRCFILES += partmap/gpt.c
 endif
 MOSTLYCLEANFILES += gpt_mod-partmap_gpt.d
 UNDSYMFILES += und-gpt.lst
@@ -1066,7 +1048,6 @@ CLEANFILES += hello.mod mod-hello.o mod-hello.c pre-hello.o hello_mod-hello_hell
 ifneq ($(hello_mod_EXPORTS),no)
 CLEANFILES += def-hello.lst
 DEFSYMFILES += def-hello.lst
-MODSRCFILES += hello/hello.c
 endif
 MOSTLYCLEANFILES += hello_mod-hello_hello.d
 UNDSYMFILES += und-hello.lst
@@ -1123,7 +1104,6 @@ CLEANFILES += boot.mod mod-boot.o mod-boot.c pre-boot.o boot_mod-commands_boot.o
 ifneq ($(boot_mod_EXPORTS),no)
 CLEANFILES += def-boot.lst
 DEFSYMFILES += def-boot.lst
-MODSRCFILES += commands/boot.c
 endif
 MOSTLYCLEANFILES += boot_mod-commands_boot.d
 UNDSYMFILES += und-boot.lst
@@ -1180,7 +1160,6 @@ CLEANFILES += terminal.mod mod-terminal.o mod-terminal.c pre-terminal.o terminal
 ifneq ($(terminal_mod_EXPORTS),no)
 CLEANFILES += def-terminal.lst
 DEFSYMFILES += def-terminal.lst
-MODSRCFILES += commands/terminal.c
 endif
 MOSTLYCLEANFILES += terminal_mod-commands_terminal.d
 UNDSYMFILES += und-terminal.lst
@@ -1237,7 +1216,6 @@ CLEANFILES += ls.mod mod-ls.o mod-ls.c pre-ls.o ls_mod-commands_ls.o und-ls.lst
 ifneq ($(ls_mod_EXPORTS),no)
 CLEANFILES += def-ls.lst
 DEFSYMFILES += def-ls.lst
-MODSRCFILES += commands/ls.c
 endif
 MOSTLYCLEANFILES += ls_mod-commands_ls.d
 UNDSYMFILES += und-ls.lst
@@ -1294,7 +1272,6 @@ CLEANFILES += cmp.mod mod-cmp.o mod-cmp.c pre-cmp.o cmp_mod-commands_cmp.o und-c
 ifneq ($(cmp_mod_EXPORTS),no)
 CLEANFILES += def-cmp.lst
 DEFSYMFILES += def-cmp.lst
-MODSRCFILES += commands/cmp.c
 endif
 MOSTLYCLEANFILES += cmp_mod-commands_cmp.d
 UNDSYMFILES += und-cmp.lst
@@ -1351,7 +1328,6 @@ CLEANFILES += cat.mod mod-cat.o mod-cat.c pre-cat.o cat_mod-commands_cat.o und-c
 ifneq ($(cat_mod_EXPORTS),no)
 CLEANFILES += def-cat.lst
 DEFSYMFILES += def-cat.lst
-MODSRCFILES += commands/cat.c
 endif
 MOSTLYCLEANFILES += cat_mod-commands_cat.d
 UNDSYMFILES += und-cat.lst
@@ -1408,7 +1384,6 @@ CLEANFILES += help.mod mod-help.o mod-help.c pre-help.o help_mod-commands_help.o
 ifneq ($(help_mod_EXPORTS),no)
 CLEANFILES += def-help.lst
 DEFSYMFILES += def-help.lst
-MODSRCFILES += commands/help.c
 endif
 MOSTLYCLEANFILES += help_mod-commands_help.d
 UNDSYMFILES += und-help.lst
@@ -1465,7 +1440,6 @@ CLEANFILES += font.mod mod-font.o mod-font.c pre-font.o font_mod-font_manager.o
 ifneq ($(font_mod_EXPORTS),no)
 CLEANFILES += def-font.lst
 DEFSYMFILES += def-font.lst
-MODSRCFILES += font/manager.c
 endif
 MOSTLYCLEANFILES += font_mod-font_manager.d
 UNDSYMFILES += und-font.lst
@@ -1522,7 +1496,6 @@ CLEANFILES += search.mod mod-search.o mod-search.c pre-search.o search_mod-comma
 ifneq ($(search_mod_EXPORTS),no)
 CLEANFILES += def-search.lst
 DEFSYMFILES += def-search.lst
-MODSRCFILES += commands/search.c
 endif
 MOSTLYCLEANFILES += search_mod-commands_search.d
 UNDSYMFILES += und-search.lst
@@ -1579,7 +1552,6 @@ CLEANFILES += test.mod mod-test.o mod-test.c pre-test.o test_mod-commands_test.o
 ifneq ($(test_mod_EXPORTS),no)
 CLEANFILES += def-test.lst
 DEFSYMFILES += def-test.lst
-MODSRCFILES += commands/test.c
 endif
 MOSTLYCLEANFILES += test_mod-commands_test.d
 UNDSYMFILES += und-test.lst
@@ -1636,7 +1608,6 @@ CLEANFILES += loopback.mod mod-loopback.o mod-loopback.c pre-loopback.o loopback
 ifneq ($(loopback_mod_EXPORTS),no)
 CLEANFILES += def-loopback.lst
 DEFSYMFILES += def-loopback.lst
-MODSRCFILES += disk/loopback.c
 endif
 MOSTLYCLEANFILES += loopback_mod-disk_loopback.d
 UNDSYMFILES += und-loopback.lst
@@ -1693,7 +1664,6 @@ CLEANFILES += configfile.mod mod-configfile.o mod-configfile.c pre-configfile.o
 ifneq ($(configfile_mod_EXPORTS),no)
 CLEANFILES += def-configfile.lst
 DEFSYMFILES += def-configfile.lst
-MODSRCFILES += commands/configfile.c
 endif
 MOSTLYCLEANFILES += configfile_mod-commands_configfile.d
 UNDSYMFILES += und-configfile.lst
@@ -1750,7 +1720,6 @@ CLEANFILES += terminfo.mod mod-terminfo.o mod-terminfo.c pre-terminfo.o terminfo
 ifneq ($(terminfo_mod_EXPORTS),no)
 CLEANFILES += def-terminfo.lst
 DEFSYMFILES += def-terminfo.lst
-MODSRCFILES += term/terminfo.c term/tparm.c
 endif
 MOSTLYCLEANFILES += terminfo_mod-term_terminfo.d terminfo_mod-term_tparm.d
 UNDSYMFILES += und-terminfo.lst
@@ -1826,7 +1795,6 @@ CLEANFILES += blocklist.mod mod-blocklist.o mod-blocklist.c pre-blocklist.o bloc
 ifneq ($(blocklist_mod_EXPORTS),no)
 CLEANFILES += def-blocklist.lst
 DEFSYMFILES += def-blocklist.lst
-MODSRCFILES += commands/blocklist.c
 endif
 MOSTLYCLEANFILES += blocklist_mod-commands_blocklist.d
 UNDSYMFILES += und-blocklist.lst
@@ -1886,7 +1854,6 @@ CLEANFILES += gzio.mod mod-gzio.o mod-gzio.c pre-gzio.o gzio_mod-io_gzio.o und-g
 ifneq ($(gzio_mod_EXPORTS),no)
 CLEANFILES += def-gzio.lst
 DEFSYMFILES += def-gzio.lst
-MODSRCFILES += io/gzio.c
 endif
 MOSTLYCLEANFILES += gzio_mod-io_gzio.d
 UNDSYMFILES += und-gzio.lst

diff --git a/conf/common.rmk b/conf/common.rmk
index 5c70ff7ec10f3b3d65b94698ee8a864ad9b81c91..f73c701bda24264d6986b0e25998b21cfecd6b8e 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -6,7 +6,7 @@ grub_script.tab.c grub_script.tab.h: normal/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
 
 # For grub-emu.
-grub_modules_init.lst: geninit.sh $(MODSRCFILES)
+grub_modules_init.lst: geninit.sh $(filter-out grub_emu_init.c,$(grub_emu_SOURCES))
        rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
 DISTCLEANFILES += grub_modules_init.lst
 

diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk
index c5f28e82f6dd5f5129945f28d8194a7d404d3b18..065128be16746cec9a4f56fdb2bd8c9bf7a7980e 100644 (file)
--- a/conf/i386-pc.mk
+++ b/conf/i386-pc.mk
@@ -1344,7 +1344,6 @@ CLEANFILES += _chain.mod mod-_chain.o mod-_chain.c pre-_chain.o _chain_mod-loade
 ifneq ($(_chain_mod_EXPORTS),no)
 CLEANFILES += def-_chain.lst
 DEFSYMFILES += def-_chain.lst
-MODSRCFILES += loader/i386/pc/chainloader.c
 endif
 MOSTLYCLEANFILES += _chain_mod-loader_i386_pc_chainloader.d
 UNDSYMFILES += und-_chain.lst
@@ -1401,7 +1400,6 @@ CLEANFILES += chain.mod mod-chain.o mod-chain.c pre-chain.o chain_mod-loader_i38
 ifneq ($(chain_mod_EXPORTS),no)
 CLEANFILES += def-chain.lst
 DEFSYMFILES += def-chain.lst
-MODSRCFILES += loader/i386/pc/chainloader_normal.c
 endif
 MOSTLYCLEANFILES += chain_mod-loader_i386_pc_chainloader_normal.d
 UNDSYMFILES += und-chain.lst
@@ -1458,7 +1456,6 @@ CLEANFILES += _linux.mod mod-_linux.o mod-_linux.c pre-_linux.o _linux_mod-loade
 ifneq ($(_linux_mod_EXPORTS),no)
 CLEANFILES += def-_linux.lst
 DEFSYMFILES += def-_linux.lst
-MODSRCFILES += loader/i386/pc/linux.c
 endif
 MOSTLYCLEANFILES += _linux_mod-loader_i386_pc_linux.d
 UNDSYMFILES += und-_linux.lst
@@ -1515,7 +1512,6 @@ CLEANFILES += linux.mod mod-linux.o mod-linux.c pre-linux.o linux_mod-loader_i38
 ifneq ($(linux_mod_EXPORTS),no)
 CLEANFILES += def-linux.lst
 DEFSYMFILES += def-linux.lst
-MODSRCFILES += loader/i386/pc/linux_normal.c
 endif
 MOSTLYCLEANFILES += linux_mod-loader_i386_pc_linux_normal.d
 UNDSYMFILES += und-linux.lst
@@ -1576,7 +1572,6 @@ CLEANFILES += normal.mod mod-normal.o mod-normal.c pre-normal.o normal_mod-norma
 ifneq ($(normal_mod_EXPORTS),no)
 CLEANFILES += def-normal.lst
 DEFSYMFILES += def-normal.lst
-MODSRCFILES += normal/arg.c normal/cmdline.c normal/command.c normal/completion.c normal/execute.c normal/function.c normal/lexer.c normal/main.c normal/menu.c normal/menu_entry.c normal/misc.c grub_script.tab.c normal/script.c normal/i386/setjmp.S
 endif
 MOSTLYCLEANFILES += normal_mod-normal_arg.d normal_mod-normal_cmdline.d normal_mod-normal_command.d normal_mod-normal_completion.d normal_mod-normal_execute.d normal_mod-normal_function.d normal_mod-normal_lexer.d normal_mod-normal_main.d normal_mod-normal_menu.d normal_mod-normal_menu_entry.d normal_mod-normal_misc.d normal_mod-grub_script_tab.d normal_mod-normal_script.d normal_mod-normal_i386_setjmp.d
 UNDSYMFILES += und-normal.lst
@@ -1881,7 +1876,6 @@ CLEANFILES += reboot.mod mod-reboot.o mod-reboot.c pre-reboot.o reboot_mod-comma
 ifneq ($(reboot_mod_EXPORTS),no)
 CLEANFILES += def-reboot.lst
 DEFSYMFILES += def-reboot.lst
-MODSRCFILES += commands/i386/pc/reboot.c
 endif
 MOSTLYCLEANFILES += reboot_mod-commands_i386_pc_reboot.d
 UNDSYMFILES += und-reboot.lst
@@ -1938,7 +1932,6 @@ CLEANFILES += halt.mod mod-halt.o mod-halt.c pre-halt.o halt_mod-commands_i386_p
 ifneq ($(halt_mod_EXPORTS),no)
 CLEANFILES += def-halt.lst
 DEFSYMFILES += def-halt.lst
-MODSRCFILES += commands/i386/pc/halt.c
 endif
 MOSTLYCLEANFILES += halt_mod-commands_i386_pc_halt.d
 UNDSYMFILES += und-halt.lst
@@ -2000,7 +1993,6 @@ CLEANFILES += _multiboot.mod mod-_multiboot.o mod-_multiboot.c pre-_multiboot.o
 ifneq ($(_multiboot_mod_EXPORTS),no)
 CLEANFILES += def-_multiboot.lst
 DEFSYMFILES += def-_multiboot.lst
-MODSRCFILES += loader/i386/pc/multiboot.c
 endif
 MOSTLYCLEANFILES += _multiboot_mod-loader_i386_pc_multiboot.d
 UNDSYMFILES += und-_multiboot.lst
@@ -2057,7 +2049,6 @@ CLEANFILES += multiboot.mod mod-multiboot.o mod-multiboot.c pre-multiboot.o mult
 ifneq ($(multiboot_mod_EXPORTS),no)
 CLEANFILES += def-multiboot.lst
 DEFSYMFILES += def-multiboot.lst
-MODSRCFILES += loader/i386/pc/multiboot_normal.c
 endif
 MOSTLYCLEANFILES += multiboot_mod-loader_i386_pc_multiboot_normal.d
 UNDSYMFILES += und-multiboot.lst
@@ -2115,7 +2106,6 @@ CLEANFILES += vbe.mod mod-vbe.o mod-vbe.c pre-vbe.o vbe_mod-video_i386_pc_vbe.o
 ifneq ($(vbe_mod_EXPORTS),no)
 CLEANFILES += def-vbe.lst
 DEFSYMFILES += def-vbe.lst
-MODSRCFILES += video/i386/pc/vbe.c video/i386/pc/vbeblit.c video/i386/pc/vbefill.c
 endif
 MOSTLYCLEANFILES += vbe_mod-video_i386_pc_vbe.d vbe_mod-video_i386_pc_vbeblit.d vbe_mod-video_i386_pc_vbefill.d
 UNDSYMFILES += und-vbe.lst
@@ -2210,7 +2200,6 @@ CLEANFILES += vbeinfo.mod mod-vbeinfo.o mod-vbeinfo.c pre-vbeinfo.o vbeinfo_mod-
 ifneq ($(vbeinfo_mod_EXPORTS),no)
 CLEANFILES += def-vbeinfo.lst
 DEFSYMFILES += def-vbeinfo.lst
-MODSRCFILES += commands/i386/pc/vbeinfo.c
 endif
 MOSTLYCLEANFILES += vbeinfo_mod-commands_i386_pc_vbeinfo.d
 UNDSYMFILES += und-vbeinfo.lst
@@ -2267,7 +2256,6 @@ CLEANFILES += vbetest.mod mod-vbetest.o mod-vbetest.c pre-vbetest.o vbetest_mod-
 ifneq ($(vbetest_mod_EXPORTS),no)
 CLEANFILES += def-vbetest.lst
 DEFSYMFILES += def-vbetest.lst
-MODSRCFILES += commands/i386/pc/vbetest.c
 endif
 MOSTLYCLEANFILES += vbetest_mod-commands_i386_pc_vbetest.d
 UNDSYMFILES += und-vbetest.lst
@@ -2324,7 +2312,6 @@ CLEANFILES += play.mod mod-play.o mod-play.c pre-play.o play_mod-commands_i386_p
 ifneq ($(play_mod_EXPORTS),no)
 CLEANFILES += def-play.lst
 DEFSYMFILES += def-play.lst
-MODSRCFILES += commands/i386/pc/play.c
 endif
 MOSTLYCLEANFILES += play_mod-commands_i386_pc_play.d
 UNDSYMFILES += und-play.lst
@@ -2381,7 +2368,6 @@ CLEANFILES += video.mod mod-video.o mod-video.c pre-video.o video_mod-video_vide
 ifneq ($(video_mod_EXPORTS),no)
 CLEANFILES += def-video.lst
 DEFSYMFILES += def-video.lst
-MODSRCFILES += video/video.c
 endif
 MOSTLYCLEANFILES += video_mod-video_video.d
 UNDSYMFILES += und-video.lst
@@ -2438,7 +2424,6 @@ CLEANFILES += gfxterm.mod mod-gfxterm.o mod-gfxterm.c pre-gfxterm.o gfxterm_mod-
 ifneq ($(gfxterm_mod_EXPORTS),no)
 CLEANFILES += def-gfxterm.lst
 DEFSYMFILES += def-gfxterm.lst
-MODSRCFILES += term/gfxterm.c
 endif
 MOSTLYCLEANFILES += gfxterm_mod-term_gfxterm.d
 UNDSYMFILES += und-gfxterm.lst
@@ -2495,7 +2480,6 @@ CLEANFILES += videotest.mod mod-videotest.o mod-videotest.c pre-videotest.o vide
 ifneq ($(videotest_mod_EXPORTS),no)
 CLEANFILES += def-videotest.lst
 DEFSYMFILES += def-videotest.lst
-MODSRCFILES += commands/videotest.c
 endif
 MOSTLYCLEANFILES += videotest_mod-commands_videotest.d
 UNDSYMFILES += und-videotest.lst

diff --git a/genmk.rb b/genmk.rb
index e1e39306f55218941ae6495fbc802252854d0833..c2f157841ce457d1c1ff6d0997f40438aa82559c 100644 (file)
--- a/genmk.rb
+++ b/genmk.rb
@@ -96,7 +96,6 @@ class PModule
 
   def rule(sources)
     prefix = @name.to_var
-    sources_str = sources.join(' ')
     objs = sources.collect do |src|
       raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
       prefix + '-' + src.to_obj
@@ -116,7 +115,6 @@ class PModule
 ifneq ($(#{prefix}_EXPORTS),no)
 CLEANFILES += #{defsym}
 DEFSYMFILES += #{defsym}
-MODSRCFILES += #{sources_str}
 endif
 MOSTLYCLEANFILES += #{deps_str}
 UNDSYMFILES += #{undsym}