Merge branch 'readline'

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index 5746cc380e69a226303af8da7300647bfa731fb0..8c921d3091a4ace436247923307745231d3d5ce5 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -323,7 +323,7 @@ info.html/%.html: info/%.t
 $(server): $(filter src/server/% src/lib/commands/% src/lib/player/% src/lib/subs/% src/lib/update/%, $(obj)) $(empth_obj) $(empth_lib) $(libs)
        $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@)
 
-$(client): $(filter src/client/%, $(obj)) src/lib/global/version.o
+$(client): $(filter src/client/%, $(obj)) src/lib/global/version.o src/lib/gen/fnameat.o
        $(call quiet-command,$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@,LINK $@)
 
 $(util): $(libs)
@@ -398,8 +398,9 @@ dist-client: $(cli_distgen)
        $(tarball) $(TARNAME)-client $(version)                         \
        -C $(srcdir)/src/client                                         \
                $(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \
-       -C $(srcdir)/include proto.h version.h                          \
+       -C $(srcdir)/include fnameat.h proto.h version.h                \
        -C $(srcdir)/src/lib/global version.c                           \
+       -C $(srcdir)/src/lib/gen fnameat.c                              \
        -C $(srcdir)/src/lib $(addprefix w32/, $(client/w32))           \
        -C $(srcdir)/man empire.6                                       \
        -C $(srcdir)/build-aux install-sh                               \
@@ -457,5 +458,5 @@ $(srcdir)/src/client/config.h.in: src/client/configure.ac src/client/aclocal.m4
        cd $(dir $@) && autoheader
        touch $@
 
-$(srcdir)/src/client/aclocal.m4: m4/ax_lib_socket_nsl.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
+$(srcdir)/src/client/aclocal.m4: m4/ax_lib_socket_nsl.m4 m4/my_lib_readline.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
        cat $^ >$@