Merge pull request #2856 from sikabane-works/release/3.0.0Alpha72

[hengbandforosx/hengbandosx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 54d9b11..fb64d11 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -164,7 +164,6 @@ hengband_SOURCES = \
        core/visuals-reseter.cpp core/visuals-reseter.h \
        core/window-redrawer.cpp core/window-redrawer.h \
        \
-       dungeon/dungeon.cpp dungeon/dungeon.h \
        dungeon/dungeon-flag-mask.h \
        dungeon/dungeon-flag-types.h \
        dungeon/dungeon-processor.cpp dungeon/dungeon-processor.h \
@@ -227,7 +226,6 @@ hengband_SOURCES = \
        floor/object-allocator.cpp floor/object-allocator.h \
        floor/object-scanner.cpp floor/object-scanner.h \
        floor/pattern-walk.cpp floor/pattern-walk.h \
-       floor/sight-definitions.h \
        floor/tunnel-generator.cpp floor/tunnel-generator.h \
        floor/wild.h floor/wild.cpp \
        \
@@ -262,6 +260,8 @@ hengband_SOURCES = \
        hpmp/hp-mp-regenerator.cpp hpmp/hp-mp-regenerator.h \
        \
        info-reader/artifact-reader.cpp info-reader/artifact-reader.h \
+       info-reader/baseitem-reader.cpp info-reader/baseitem-reader.h \
+       info-reader/baseitem-tokens-table.cpp info-reader/baseitem-tokens-table.h \
        info-reader/dungeon-info-tokens-table.cpp info-reader/dungeon-info-tokens-table.h \
        info-reader/dungeon-reader.cpp info-reader/dungeon-reader.h \
        info-reader/ego-reader.cpp info-reader/ego-reader.h \
@@ -270,8 +270,6 @@ hengband_SOURCES = \
        info-reader/fixed-map-parser.cpp info-reader/fixed-map-parser.h \
        info-reader/general-parser.cpp info-reader/general-parser.h \
        info-reader/info-reader-util.cpp info-reader/info-reader-util.h \
-       info-reader/kind-info-tokens-table.cpp info-reader/kind-info-tokens-table.h \
-       info-reader/kind-reader.cpp info-reader/kind-reader.h \
        info-reader/magic-reader.cpp info-reader/magic-reader.h \
        info-reader/parse-error-types.h \
        info-reader/race-info-tokens-table.cpp info-reader/race-info-tokens-table.h \
@@ -805,7 +803,6 @@ hengband_SOURCES = \
        \
        specific-object/blade-turner.cpp specific-object/blade-turner.h \
        specific-object/bloody-moon.cpp specific-object/bloody-moon.h \
-       specific-object/bow.cpp specific-object/bow.h \
        specific-object/chest.cpp specific-object/chest.h \
        specific-object/death-crimson.cpp specific-object/death-crimson.h \
        specific-object/death-scythe.cpp specific-object/death-scythe.h \
@@ -910,19 +907,21 @@ hengband_SOURCES = \
        system/angband-exceptions.h \
        system/angband-version.cpp system/angband-version.h \
        system/artifact-type-definition.cpp system/artifact-type-definition.h \
-       system/baseitem-info-definition.cpp system/baseitem-info-definition.h \
+       system/baseitem-info.cpp system/baseitem-info.h \
        system/building-type-definition.cpp system/building-type-definition.h \
        system/dungeon-data-definition.h \
-       system/floor-type-definition.h \
+       system/dungeon-info.cpp system/dungeon-info.h \
+       system/floor-type-definition.cpp system/floor-type-definition.h \
        system/grid-type-definition.cpp system/grid-type-definition.h \
        system/game-option-types.h \
        system/h-basic.h system/h-config.h \
        system/h-system.h system/h-type.h \
-       system/monster-race-definition.h \
-       system/monster-type-definition.cpp system/monster-type-definition.h \
-       system/object-type-definition.cpp system/object-type-definition.h \
+       system/item-entity.cpp system/item-entity.h \
+       system/monster-entity.cpp system/monster-entity.h \
+       system/monster-race-info.h \
        system/player-type-definition.cpp system/player-type-definition.h \
        system/system-variables.cpp system/system-variables.h \
+       system/terrain-type-definition.cpp system/terrain-type-definition.h \
        system/gamevalue.h \
        \
        target/grid-selector.cpp target/grid-selector.h \
@@ -967,7 +966,6 @@ hengband_SOURCES = \
        util/rng-xoshiro.cpp util/rng-xoshiro.h \
        util/sort.cpp util/sort.h \
        util/string-processor.cpp util/string-processor.h \
-       util/tag-sorter.cpp util/tag-sorter.h \
        \
        view/display-birth.cpp view/display-birth.h \
        view/display-characteristic.cpp view/display-characteristic.h \