Merge remote-tracking branch 'remotes/origin/feature/Fix-window-redrawer' into develop

[hengband/hengband.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index aeebdef..a564cee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,21 +20,20 @@ hengband_SOURCES = \
        \
        artifact/artifact-info.c artifact/artifact-info.h \
        artifact/fixed-art-generator.c artifact/fixed-art-generator.h \
+       artifact/fixed-art-types.h \
        artifact/random-art-activation.c artifact/random-art-activation.h \
        artifact/random-art-bias-types.h \
        artifact/random-art-characteristics.c artifact/random-art-characteristics.h \
+       artifact/random-art-effects.h \
        artifact/random-art-generator.c artifact/random-art-generator.h \
        artifact/random-art-misc.c artifact/random-art-misc.h \
        artifact/random-art-pval-investor.c artifact/random-art-pval-investor.h \
        artifact/random-art-resistance.c artifact/random-art-resistance.h \
        artifact/random-art-slay.c artifact/random-art-slay.h \
        \
-       art-definition/fixed-art-types.h \
-       art-definition/random-art-effects.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 \
+       autopick/autopick-flags-table.h \
        autopick/autopick-key-flag-process.h autopick/autopick-keys-table.h \
        autopick/autopick-menu-data-table.c autopick/autopick-menu-data-table.h \
        autopick/autopick-methods-table.h \
@@ -800,7 +799,8 @@ hengband_SOURCES = \
        \
        system/alloc-entries.c system/alloc-entries.h \
        system/alloc-entry-definition.h \
-       system/angband.h system/angband-version.h \
+       system/angband.h \
+       system/angband-version.c system/angband-version.h \
        system/artifact-type-definition.c system/artifact-type-definition.h \
        system/building-type-definition.c system/building-type-definition.h \
        system/dungeon-data-definition.h \
@@ -900,8 +900,8 @@ EXTRA_DIST = \
        gcc-wrap
 
 DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir)/src 
-CFLAGS += $(XFT_CFLAGS)
-LIBS += $(XFT_LIBS)
+CFLAGS += $(XFT_CFLAGS) $(libcurl_CFLAGS)
+LIBS += $(XFT_LIBS) $(libcurl_LIBS)
 COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)