client: Add readline support to empire client

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index e0af8b472d6c1c08c172ff092e99b2c5057bfd87..c1a6aa9237a790f72698fe541e2844bd096f8c2d 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -27,7 +27,7 @@
 #   Make.mk: The real Makefile, included by GNUmakefile
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2014
+#      Markus Armbruster, 2005-2015
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -169,13 +169,6 @@ CPPFLAGS += -I$(srcdir)/include -I.
 ifeq ($(empthread),Windows)    # really: W32, regardless of thread package
 CPPFLAGS += -I$(srcdir)/src/lib/w32
 endif
-ifeq ($(have_gcc),yes)
-CFLAGS += -fno-builtin-carg    # conflicts with our carg()
-CFLAGS += -fno-common
-CFLAGS += -Wall -W -Wno-unused-parameter -Wpointer-arith       \
--Wstrict-prototypes -Wmissing-prototypes -Wnested-externs      \
--Wredundant-decls
-endif
 $(client): LDLIBS := $(LIBS_client)
 $(server): LDLIBS := $(LIBS_server)
 
@@ -264,6 +257,7 @@ ifeq ($(empthread),LWP)
        $(srcdir)/tests/build-test $(srcdir)
        $(srcdir)/tests/navi-march-test $(srcdir)
        $(srcdir)/tests/fire-test $(srcdir)
+       $(srcdir)/tests/torpedo-test $(srcdir)
        $(srcdir)/tests/bridgefall-test $(srcdir)
        $(srcdir)/tests/retreat-test $(srcdir)
 else
@@ -272,6 +266,7 @@ else
        @echo "$(srcdir)/tests/build-test SKIPPED"
        @echo "$(srcdir)/tests/navi-march-test SKIPPED"
        @echo "$(srcdir)/tests/fire-test SKIPPED"
+       @echo "$(srcdir)/tests/torpedo-test SKIPPED"
        @echo "$(srcdir)/tests/bridgefall-test SKIPPED"
        @echo "$(srcdir)/tests/retreat-test SKIPPED"
 endif
@@ -437,5 +432,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_readline.m4 m4/ax_lib_socket_nsl.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
        cat $^ >$@