[Refactor] #40457 Sorted Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1a6ce67..c9e70b0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,12 +5,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 bin_PROGRAMS = hengband
 
 hengband_SOURCES = \
-       system/angband.h system/angband-version.h \
-       system/h-basic.h system/h-config.h \
-       system/h-define.h system/h-system.h system/h-type.h \
-       system/system-variables.c system/system-variables.h \
-       system/gamevalue.h \
-       \
        autopick/autopick.c autopick/autopick.h \
        autopick/autopick-commands-table.h autopick/autopick-dirty-flags.h \
        autopick/autopick-editor-table.h autopick/autopick-flags-table.h \
@@ -52,82 +46,71 @@ hengband_SOURCES = \
        birth/auto-roller.c birth/auto-roller.h \
        birth/birth-wizard.c birth/birth-wizard.h \
        \
-       main/music-definitions-table.c main/music-definitions-table.h \
-       main/sound-definitions-table.c main/sound-definitions-table.h \
-       main/x11-gamma-builder.c main/x11-gamma-builder.h \
-       main/init.c main/init.h \
-       \
-       market/arena-info-table.c market/arena-info-table.h \
-       market/building-util.c market/building-util.h \
-       market/play-gamble.c market/play-gamble.h \
-       market/poker.c market/poker.h \
-       market/articles-on-sale.c market/articles-on-sale.h \
-       market/gold-magnification-table.c market/gold-magnification-table.h \
-       market/arena.c market/arena.h \
-       market/bounty-prize-table.c market/bounty-prize-table.h \
-       market/bounty.c market/bounty.h \
-       market/building-recharger.c market/building-recharger.h \
-       market/building-quest.c market/building-quest.h \
-       market/building-service.c market/building-service.h \
-       market/building-craft-weapon.c market/building-craft-weapon.h \
-       market/building-craft-armor.c market/building-craft-armor.h \
-       market/building-craft-fix.c market/building-craft-fix.h \
-       market/building-monster.c market/building-monster.h \
-       market/building-enchanter.c market/building-enchanter.h \
-       market/building-actions-table.h \
-       \
-       store/store.c store/store.h \
-       store/black-market.c store/black-market.h \
-       store/rumor.c store/rumor.h \
-       store/say-comments.c store/say-comments.h \
-       store/store-util.c store/store-util.h \
-       store/store-owners.c store/store-owners.h \
-       store/store-owner-comments.c store/store-owner-comments.h \
+       cmd/cmd-building.c cmd/cmd-building.h \
+       cmd/object-group-table.c cmd/object-group-table.h \
+       cmd/cmd-basic.c cmd/cmd-basic.h \
+       cmd/cmd-draw.c cmd/cmd-draw.h \
+       cmd/cmd-inn.c cmd/cmd-inn.h \
+       cmd/cmd-visuals.c cmd/cmd-visuals.h \
        \
-       view/display-characteristic.c view/display-characteristic.h \
-       view/display-fruit.c view/display-fruit.h \
-       view/display-player-stat-info.c view/display-player-stat-info.h \
-       view/display-player-misc-info.c view/display-player-misc-info.h \
-       view/display-player-middle.c view/display-player-middle.h \
-       view/display-player.c view/display-player.h \
-       view/status-first-page.c view/status-first-page.h \
-       view/display-util.c view/display-util.h \
-       view/display-birth.c view/display-birth.h \
+       cmd-action/cmd-attack.c cmd-action/cmd-attack.h \
+       cmd-action/cmd-hissatsu.c cmd-action/cmd-hissatsu.h \
+       cmd-action/cmd-mane.c cmd-action/cmd-mane.h \
+       cmd-action/cmd-pet.c cmd-action/cmd-pet.h \
+       cmd-action/cmd-spell.c cmd-action/cmd-spell.h \
        \
-       player/avatar.h player/avatar.c \
-       player/mimic-info-table.c player/mimic-info-table.h \
-       player/process-death.c player/process-death.h \
-       player/process-name.c player/process-name.h \
-       player/race-info-table.c player/race-info-table.h\
-       player/race-resistances.c player/race-resistances.h \
-       player/permanent-resistances.c player/permanent-resistances.h \
-       player/temporary-resistances.c player/temporary-resistances.h \
-       player/digestion-processor.c player/digestion-processor.h \
+       cmd-io/cmd-autopick.c cmd-io/cmd-autopick.c \
+       cmd-io/cmd-diary.c cmd/-iocmd-diary.h \
+       cmd-io/cmd-dump.c cmd-io/cmd-dump.h \
+       cmd-io/cmd-gameoption.c cmd-io/cmd-gameoption.h \
+       cmd-io/cmd-help.c cmd-io/cmd-help.h \
+       cmd-io/cmd-knowledge.c cmd-io/cmd-knowledge.h \
+       cmd-io/cmd-macro.c cmd-io/cmd-macro.h \
+       cmd-io/cmd-menu-content-table.c cmd-io/cmd-menu-content-table.h \
+       cmd-io/cmd-process-screen.c cmd-io/cmd-process-screen.h \
+       cmd-io/cmd-save.c cmd-io/cmd-save.h \
+       cmd-io/diary-subtitle-table.c cmd-io/diary-subtitle-table.h \
+       cmd-io/feeling-table.c cmd-io/feeling-table.h \
        \
-       io/files-util.c io/files-util.h \
-       io/gf-descriptions.c io/gf-descriptions.h \
-       io/targeting.c io/targeting.h \
-       io/tokenizer.c io/tokenizer.h \
-       io/interpret-pref-file.c io/interpret-pref-file.h \
-       io/read-pref-file.c io/read-pref-file.h \
-       io/exit-panic.c io/exit-panic.h \
-       io/write-diary.c io/write-diary.h \
-       io/mutations-dump.c io/mutations-dump.h \
-       io/report.c io/report.h \
-       io/signal-handlers.c io/signal-handlers.h \
-       io/uid-checker.c io/uid-checker.h \
-       io/input-key-processor.c io/input-key-processor.h \
-       io/load.c io/load.h \
-       io/save.c io/save.h \
-       io/inet.c io/inet.h \
-       io/chuukei.c io/chuukei.h \
-       io/pref-file-expressor.c io/pref-file-expressor.h \
+       cmd-item/cmd-activate.c cmd-item/cmd-activate.h \
+       cmd-item/cmd-eat.c cmd-item/cmd-eat.h \
+       cmd-item/cmd-item.c cmd-item/cmd-item.h \
+       cmd-item/cmd-magiceat.c cmd-item/cmd-magiceat.h \
+       cmd-item/cmd-quaff.c cmd-item/cmd-quaff.h \
+       cmd-item/cmd-read.c cmd-item/cmd-read.h \
+       cmd-item/cmd-smith.c cmd-item/cmd-smith.h \
+       cmd-item/cmd-usestaff.c cmd-item/cmd-usestaff.h \
+       cmd-item/cmd-zaprod.c cmd-item/cmd-zaprod.h \
+       cmd-item/cmd-zapwand.c cmd-item/cmd-zapwand.h \
        \
-       io-dump/character-dump.c io-dump/character-dump.h \
-       io-dump/dump-remover.c io-dump/dump-remover.h \
-       io-dump/dump-util.c io-dump/dump-util.h \
-       io-dump/player-status-dump.c io-dump/player-status-dump.h \
-       io-dump/special-class-dump.c io-dump/special-class-dump.h \
+       combat/player-attack-util.h \
+       combat/attack-power-table.c combat/attack-power-table.h \
+       combat/aura-counterattack.c combat/aura-counterattack.h \
+       combat/hallucination-attacks-table.c combat/hallucination-attacks-table.h \
+       combat/monster-attack-types.c combat/monster-attack-types.h \
+       combat/martial-arts-table.c combat/martial-arts-table.h \
+       combat/insults-moans.c combat/insults-moans.h \
+       combat/monster-attack-effects.h \
+       combat/attack-accuracy.c combat/attack-accuracy.h \
+       combat/slaying.c combat/slaying.h \
+       combat/combat-options-type.h \
+       combat/attack-criticality.c combat/attack-criticality.h \
+       combat/player-attack.c combat/player-attack.h \
+       combat/blood-sucking-processor.c combat/blood-sucking-processor.h \
+       combat/vorpal-weapon.c combat/vorpal-weapon.h \
+       combat/attack-chaos-effect.c combat/attack-chaos-effect.h \
+       combat/monster-attack-player.c combat/monster-attack-player.h \
+       combat/monster-attack-monster.c combat/monster-attack-monster.h \
+       combat/melee-postprocess.c combat/melee-postprocess.h \
+       combat/melee-switcher.c combat/melee-switcher.h \
+       combat/melee-util.c combat/melee-util.h \
+       combat/monster-attack-util.c combat/monster-attack-util.h \
+       combat/monster-attack-describer.c combat/monster-attack-describer.h \
+       combat/monster-eating.c combat/monster-eating.h \
+       combat/monster-attack-status.c combat/monster-attack-status.h \
+       combat/monster-attack-switcher.c combat/monster-attack-switcher.h \
+       combat/shoot.c combat/shoot.h \
+       combat/snipe.c combat/snipe.h \
        \
        core/game-play.c core/game-play.h \
        core/show-file.c core/show-file.h \
@@ -148,6 +131,29 @@ hengband_SOURCES = \
        dungeon/dungeon-file.c dungeon/dungeon-file.h \
        dungeon/quest.h dungeon/quest.c \
        \
+       effect/effect-feature.c effect/effect-feature.h \
+       effect/effect-item.c effect/effect-item.h \
+       effect/spells-effect-util.c effect/spells-effect-util.h \
+       effect/effect-player.c effect/effect-player.h \
+       effect/effect-monster.c effect/effect-monster.h \
+       effect/effect-monster-util.c effect/effect-monster-util.h \
+       effect/effect-monster-resist-hurt.c effect/effect-monster-resist-hurt.h \
+       effect/effect-monster-psi.c effect/effect-monster-psi.h \
+       effect/effect-monster-domination.c effect/effect-monster-domination.h \
+       effect/effect-monster-oldies.c effect/effect-monster-oldies.h \
+       effect/effect-monster-charm.c effect/effect-monster-charm.h \
+       effect/effect-monster-lite-dark.c effect/effect-monster-lite-dark.h \
+       effect/effect-monster-evil.c effect/effect-monster-evil.h \
+       effect/effect-monster-spirit.c effect/effect-monster-spirit.h \
+       effect/effect-monster-switcher.c effect/effect-monster-switcher.h \
+       effect/effect-player-util.h \
+       effect/effect-player-resist-hurt.c effect/effect-player-resist-hurt.h \
+       effect/effect-player-oldies.c effect/effect-player-oldies.h \
+       effect/effect-player-curse.c effect/effect-player-curse.h \
+       effect/effect-player-spirit.c effect/effect-player-spirit.h \
+       effect/effect-player-switcher.c effect/effect-player-switcher.h \
+       effect/effect-characteristics.h \
+       \
        floor/floor.c floor/floor.h floor/floor-events.c floor/floor-events.h \
        floor/floor-generate.c floor/floor-generate.h \
        floor/floor-save.h floor/floor-save.c floor/floor-town.h floor/floor-town.c \
@@ -156,13 +162,82 @@ hengband_SOURCES = \
        floor/wild.h floor/wild.c \
        floor/geometry.c floor/geometry.h \
        \
-       locale/japanese.c locale/japanese.h locale/english.c locale/english.h \
-       \
        grid/feature.c grid/feature.h \
        grid/grid.c grid/grid.h grid/trap.c grid/trap.h \
        \
+       inventory/simple-appraiser.c inventory/simple-appraiser.h \
+       inventory/inventory-curse.c inventory/inventory-curse.h \
+       inventory/recharge-processor.c inventory/recharge-processor.h \
+       inventory/pack-overflow.c inventory/pack-overflow.h \
+       inventory/player-inventory.c inventory/player-inventory.h \
+       inventory/inventory-damage.c inventory/inventory-damage.h \
+       \
+       io/files-util.c io/files-util.h \
+       io/gf-descriptions.c io/gf-descriptions.h \
+       io/targeting.c io/targeting.h \
+       io/tokenizer.c io/tokenizer.h \
+       io/interpret-pref-file.c io/interpret-pref-file.h \
+       io/read-pref-file.c io/read-pref-file.h \
+       io/exit-panic.c io/exit-panic.h \
+       io/write-diary.c io/write-diary.h \
+       io/mutations-dump.c io/mutations-dump.h \
+       io/report.c io/report.h \
+       io/signal-handlers.c io/signal-handlers.h \
+       io/uid-checker.c io/uid-checker.h \
+       io/input-key-processor.c io/input-key-processor.h \
+       io/load.c io/load.h \
+       io/save.c io/save.h \
+       io/inet.c io/inet.h \
+       io/chuukei.c io/chuukei.h \
+       io/pref-file-expressor.c io/pref-file-expressor.h \
+       \
+       io-dump/character-dump.c io-dump/character-dump.h \
+       io-dump/dump-remover.c io-dump/dump-remover.h \
+       io-dump/dump-util.c io-dump/dump-util.h \
+       io-dump/player-status-dump.c io-dump/player-status-dump.h \
+       io-dump/special-class-dump.c io-dump/special-class-dump.h \
+       \
+       knowledge/knowledge-autopick.c knowledge/knowledge-autopick.h \
+       knowledge/knowledge-experiences.c knowledge/knowledge-experiences.h \
+       knowledge/knowledge-features.c knowledge/knowledge-features.h \
+       knowledge/knowledge-inventory.c knowledge/knowledge-inventory.h \
+       knowledge/knowledge-items.c knowledge/knowledge-items.h \
+       knowledge/knowledge-monsters.c knowledge/knowledge-monsters.h \
+       knowledge/knowledge-mutations.c knowledge/knowledge-mutations.h \
+       knowledge/knowledge-uniques.c knowledge/knowledge-uniques.h \
+       knowledge/knowledge-self.c knowledge/knowledge-self.h \
+       knowledge/knowledge-quests.c knowledge/knowledge-quests.h \
+       knowledge/lighting-level-table.c knowledge/lighting-level-table.h \
+       knowledge/monster-group-table.c knowledge/monster-group-table.h \
+       \
+       locale/japanese.c locale/japanese.h locale/english.c locale/english.h \
+       \
        main.c main-x11.c main-gcu.c \
        \
+       main/music-definitions-table.c main/music-definitions-table.h \
+       main/sound-definitions-table.c main/sound-definitions-table.h \
+       main/x11-gamma-builder.c main/x11-gamma-builder.h \
+       main/init.c main/init.h \
+       \
+       market/arena-info-table.c market/arena-info-table.h \
+       market/building-util.c market/building-util.h \
+       market/play-gamble.c market/play-gamble.h \
+       market/poker.c market/poker.h \
+       market/articles-on-sale.c market/articles-on-sale.h \
+       market/gold-magnification-table.c market/gold-magnification-table.h \
+       market/arena.c market/arena.h \
+       market/bounty-prize-table.c market/bounty-prize-table.h \
+       market/bounty.c market/bounty.h \
+       market/building-recharger.c market/building-recharger.h \
+       market/building-quest.c market/building-quest.h \
+       market/building-service.c market/building-service.h \
+       market/building-craft-weapon.c market/building-craft-weapon.h \
+       market/building-craft-armor.c market/building-craft-armor.h \
+       market/building-craft-fix.c market/building-craft-fix.h \
+       market/building-monster.c market/building-monster.h \
+       market/building-enchanter.c market/building-enchanter.h \
+       market/building-actions-table.h \
+       \
        mind/mind.c mind/mind.h \
        mind/racial.c mind/racial.h \
        mind/racial-samurai.c mind/racial-samurai.h \
@@ -191,8 +266,22 @@ hengband_SOURCES = \
        monster/monster1.c monster/monster2.c \
        monster/horror-descriptions.c monster/horror-descriptions.h \
        \
-       pet/pet-fall-off.c pet/pet-fall-off.h \
-       pet/pet-util.c pet/pet-util.h \
+       mspell/monster-spell.h \
+       mspell/mspells1.c mspell/mspells2.c mspell/mspells3.c \
+       mspell/assign-monster-spell.c mspell/assign-monster-spell.h \
+       mspell/mspell-summon.c mspell/mspell-summon.h \
+       mspell/mspell-util.c mspell/mspell-util.h \
+       mspell/mspell-curse.c mspell/mspell-curse.h \
+       mspell/mspell-type.h \
+       mspell/mspell-damage-calculator.c mspell/mspell-damage-calculator.h \
+       mspell/mspell-learn-checker.c mspell/mspell-learn-checker.h \
+       mspell/mspell-breath.c mspell/mspell-breath.h \
+       mspell/mspell-ball.c mspell/mspell-ball.h \
+       mspell/mspell-bolt.c mspell/mspell-bolt.h \
+       mspell/mspell-floor.c mspell/mspell-floor.h \
+       mspell/mspell-status.c mspell/mspell-status.h \
+       mspell/mspell-special.c mspell/mspell-special.h \
+       mspell/mspell-particularity.c mspell/mspell-particularity.h \
        \
        mutation/mutation.c mutation/mutation.h \
        mutation/mutation-processor.c mutation/mutation-processor.h \
@@ -224,13 +313,15 @@ hengband_SOURCES = \
        object/item-feeling.h object/item-use-flags.h \
        object/torch.c object/torch.h \
        \
-       inventory/simple-appraiser.c inventory/simple-appraiser.h \
-       inventory/inventory-curse.c inventory/inventory-curse.h \
-       inventory/recharge-processor.c inventory/recharge-processor.h \
-       inventory/pack-overflow.c inventory/pack-overflow.h \
-       inventory/player-inventory.c inventory/player-inventory.h \
-       inventory/inventory-damage.c inventory/inventory-damage.h \
-       \
+       player/avatar.h player/avatar.c \
+       player/mimic-info-table.c player/mimic-info-table.h \
+       player/process-death.c player/process-death.h \
+       player/process-name.c player/process-name.h \
+       player/race-info-table.c player/race-info-table.h\
+       player/race-resistances.c player/race-resistances.h \
+       player/permanent-resistances.c player/permanent-resistances.h \
+       player/temporary-resistances.c player/temporary-resistances.h \
+       player/digestion-processor.c player/digestion-processor.h \
        player/player-move.c player/player-move.h \
        player/player-damage.c player/player-damage.h \
        player/player-status.c player/player-status.h \
@@ -245,6 +336,9 @@ hengband_SOURCES = \
        player/player-personality.c player/player-personality.h \
        player/player-sex.c player/player-sex.h player/selfinfo.c player/selfinfo.h \
        \
+       pet/pet-fall-off.c pet/pet-fall-off.h \
+       pet/pet-util.c pet/pet-util.h \
+       \
        realm/realm.c realm/realm.h \
        realm/realm-arcane.c realm/realm-arcane.h \
        realm/realm-chaos.c realm/realm-chaos.h \
@@ -268,29 +362,6 @@ hengband_SOURCES = \
        room/rooms-pit-nest.c room/rooms-pit-nest.h \
        room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \
        \
-       effect/effect-feature.c effect/effect-feature.h \
-       effect/effect-item.c effect/effect-item.h \
-       effect/spells-effect-util.c effect/spells-effect-util.h \
-       effect/effect-player.c effect/effect-player.h \
-       effect/effect-monster.c effect/effect-monster.h \
-       effect/effect-monster-util.c effect/effect-monster-util.h \
-       effect/effect-monster-resist-hurt.c effect/effect-monster-resist-hurt.h \
-       effect/effect-monster-psi.c effect/effect-monster-psi.h \
-       effect/effect-monster-domination.c effect/effect-monster-domination.h \
-       effect/effect-monster-oldies.c effect/effect-monster-oldies.h \
-       effect/effect-monster-charm.c effect/effect-monster-charm.h \
-       effect/effect-monster-lite-dark.c effect/effect-monster-lite-dark.h \
-       effect/effect-monster-evil.c effect/effect-monster-evil.h \
-       effect/effect-monster-spirit.c effect/effect-monster-spirit.h \
-       effect/effect-monster-switcher.c effect/effect-monster-switcher.h \
-       effect/effect-player-util.h \
-       effect/effect-player-resist-hurt.c effect/effect-player-resist-hurt.h \
-       effect/effect-player-oldies.c effect/effect-player-oldies.h \
-       effect/effect-player-curse.c effect/effect-player-curse.h \
-       effect/effect-player-spirit.c effect/effect-player-spirit.h \
-       effect/effect-player-switcher.c effect/effect-player-switcher.h \
-       effect/effect-characteristics.h \
-       \
        spell/technic-info-table.c spell/technic-info-table.h \
        spell/spells-execution.c spell/spells-execution.h \
        spell/spells-util.h spell/spells-type.h \
@@ -306,101 +377,19 @@ hengband_SOURCES = \
        spell/spells-world.c spell/spells-world.h \
        spell/spells-detection.c spell/spells-detection.h \
        \
-       mspell/monster-spell.h \
-       mspell/mspells1.c mspell/mspells2.c mspell/mspells3.c \
-       mspell/assign-monster-spell.c mspell/assign-monster-spell.h \
-       mspell/mspell-summon.c mspell/mspell-summon.h \
-       mspell/mspell-util.c mspell/mspell-util.h \
-       mspell/mspell-curse.c mspell/mspell-curse.h \
-       mspell/mspell-type.h \
-       mspell/mspell-damage-calculator.c mspell/mspell-damage-calculator.h \
-       mspell/mspell-learn-checker.c mspell/mspell-learn-checker.h \
-       mspell/mspell-breath.c mspell/mspell-breath.h \
-       mspell/mspell-ball.c mspell/mspell-ball.h \
-       mspell/mspell-bolt.c mspell/mspell-bolt.h \
-       mspell/mspell-floor.c mspell/mspell-floor.h \
-       mspell/mspell-status.c mspell/mspell-status.h \
-       mspell/mspell-special.c mspell/mspell-special.h \
-       mspell/mspell-particularity.c mspell/mspell-particularity.h \
-       \
-       knowledge/knowledge-autopick.c knowledge/knowledge-autopick.h \
-       knowledge/knowledge-experiences.c knowledge/knowledge-experiences.h \
-       knowledge/knowledge-features.c knowledge/knowledge-features.h \
-       knowledge/knowledge-inventory.c knowledge/knowledge-inventory.h \
-       knowledge/knowledge-items.c knowledge/knowledge-items.h \
-       knowledge/knowledge-monsters.c knowledge/knowledge-monsters.h \
-       knowledge/knowledge-mutations.c knowledge/knowledge-mutations.h \
-       knowledge/knowledge-uniques.c knowledge/knowledge-uniques.h \
-       knowledge/knowledge-self.c knowledge/knowledge-self.h \
-       knowledge/knowledge-quests.c knowledge/knowledge-quests.h \
-       knowledge/lighting-level-table.c knowledge/lighting-level-table.h \
-       knowledge/monster-group-table.c knowledge/monster-group-table.h \
-       \
-       cmd/cmd-building.c cmd/cmd-building.h \
-       cmd/object-group-table.c cmd/object-group-table.h \
-       cmd/cmd-basic.c cmd/cmd-basic.h \
-       cmd/cmd-draw.c cmd/cmd-draw.h \
-       cmd/cmd-inn.c cmd/cmd-inn.h \
-       cmd/cmd-visuals.c cmd/cmd-visuals.h \
-       \
-       cmd-action/cmd-attack.c cmd-action/cmd-attack.h \
-       cmd-action/cmd-hissatsu.c cmd-action/cmd-hissatsu.h \
-       cmd-action/cmd-mane.c cmd-action/cmd-mane.h \
-       cmd-action/cmd-pet.c cmd-action/cmd-pet.h \
-       cmd-action/cmd-spell.c cmd-action/cmd-spell.h \
-       \
-       cmd-io/cmd-autopick.c cmd-io/cmd-autopick.c \
-       cmd-io/cmd-diary.c cmd/-iocmd-diary.h \
-       cmd-io/cmd-dump.c cmd-io/cmd-dump.h \
-       cmd-io/cmd-gameoption.c cmd-io/cmd-gameoption.h \
-       cmd-io/cmd-help.c cmd-io/cmd-help.h \
-       cmd-io/cmd-knowledge.c cmd-io/cmd-knowledge.h \
-       cmd-io/cmd-macro.c cmd-io/cmd-macro.h \
-       cmd-io/cmd-menu-content-table.c cmd-io/cmd-menu-content-table.h \
-       cmd-io/cmd-process-screen.c cmd-io/cmd-process-screen.h \
-       cmd-io/cmd-save.c cmd-io/cmd-save.h \
-       cmd-io/diary-subtitle-table.c cmd-io/diary-subtitle-table.h \
-       cmd-io/feeling-table.c cmd-io/feeling-table.h \
-       \
-       cmd-item/cmd-activate.c cmd-item/cmd-activate.h \
-       cmd-item/cmd-eat.c cmd-item/cmd-eat.h \
-       cmd-item/cmd-item.c cmd-item/cmd-item.h \
-       cmd-item/cmd-magiceat.c cmd-item/cmd-magiceat.h \
-       cmd-item/cmd-quaff.c cmd-item/cmd-quaff.h \
-       cmd-item/cmd-read.c cmd-item/cmd-read.h \
-       cmd-item/cmd-smith.c cmd-item/cmd-smith.h \
-       cmd-item/cmd-usestaff.c cmd-item/cmd-usestaff.h \
-       cmd-item/cmd-zaprod.c cmd-item/cmd-zaprod.h \
-       cmd-item/cmd-zapwand.c cmd-item/cmd-zapwand.h \
+       store/store.c store/store.h \
+       store/black-market.c store/black-market.h \
+       store/rumor.c store/rumor.h \
+       store/say-comments.c store/say-comments.h \
+       store/store-util.c store/store-util.h \
+       store/store-owners.c store/store-owners.h \
+       store/store-owner-comments.c store/store-owner-comments.h \
        \
-       combat/player-attack-util.h \
-       combat/attack-power-table.c combat/attack-power-table.h \
-       combat/aura-counterattack.c combat/aura-counterattack.h \
-       combat/hallucination-attacks-table.c combat/hallucination-attacks-table.h \
-       combat/monster-attack-types.c combat/monster-attack-types.h \
-       combat/martial-arts-table.c combat/martial-arts-table.h \
-       combat/insults-moans.c combat/insults-moans.h \
-       combat/monster-attack-effects.h \
-       combat/attack-accuracy.c combat/attack-accuracy.h \
-       combat/slaying.c combat/slaying.h \
-       combat/combat-options-type.h \
-       combat/attack-criticality.c combat/attack-criticality.h \
-       combat/player-attack.c combat/player-attack.h \
-       combat/blood-sucking-processor.c combat/blood-sucking-processor.h \
-       combat/vorpal-weapon.c combat/vorpal-weapon.h \
-       combat/attack-chaos-effect.c combat/attack-chaos-effect.h \
-       combat/monster-attack-player.c combat/monster-attack-player.h \
-       combat/monster-attack-monster.c combat/monster-attack-monster.h \
-       combat/melee-postprocess.c combat/melee-postprocess.h \
-       combat/melee-switcher.c combat/melee-switcher.h \
-       combat/melee-util.c combat/melee-util.h \
-       combat/monster-attack-util.c combat/monster-attack-util.h \
-       combat/monster-attack-describer.c combat/monster-attack-describer.h \
-       combat/monster-eating.c combat/monster-eating.h \
-       combat/monster-attack-status.c combat/monster-attack-status.h \
-       combat/monster-attack-switcher.c combat/monster-attack-switcher.h \
-       combat/shoot.c combat/shoot.h \
-       combat/snipe.c combat/snipe.h \
+       system/angband.h system/angband-version.h \
+       system/h-basic.h system/h-config.h \
+       system/h-define.h system/h-system.h system/h-type.h \
+       system/system-variables.c system/system-variables.h \
+       system/gamevalue.h \
        \
        term/gameterm.c term/gameterm.h \
        term/z-form.c term/z-form.h term/z-rand.c term/z-rand.h \
@@ -409,6 +398,16 @@ hengband_SOURCES = \
        \
        util/util.c util/util.h \
        \
+       view/display-characteristic.c view/display-characteristic.h \
+       view/display-fruit.c view/display-fruit.h \
+       view/display-player-stat-info.c view/display-player-stat-info.h \
+       view/display-player-misc-info.c view/display-player-misc-info.h \
+       view/display-player-middle.c view/display-player-middle.h \
+       view/display-player.c view/display-player.h \
+       view/status-first-page.c view/status-first-page.h \
+       view/display-util.c view/display-util.h \
+       view/display-birth.c view/display-birth.h \
+       \
        wizard/wizard-spoiler.c wizard/wizard-spoiler.h\
        wizard/wizard-special-process.c wizard/wizard-special-process.h \
        \