#
# Empire - A multi-player, client/server Internet based war game.
-# Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+# Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
# Ken Stevens, Steve McClure, Markus Armbruster
#
# Empire is free software: you can redistribute it and/or modify
# 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',
# Source files
ifeq ($(revctrl),git)
-src := $(shell cd $(srcdir) && git ls-files)
+src := $(shell cd $(srcdir) && git ls-files | uniq)
else
include $(srcdir)/sources.mk
endif
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)
.PHONY: check check-accept _check
check check-accept: _check
-check: export override EMPIRE_CHECK_ACCEPT :=
-check-accept: export override EMPIRE_CHECK_ACCEPT := y
+check: export EMPIRE_CHECK_ACCEPT :=
+check-accept: export EMPIRE_CHECK_ACCEPT := y
_check: all
@echo "Warning: test suite is immature and needs work." >&2
$(srcdir)/tests/files-test $(srcdir)
$(srcdir)/tests/smoke-test $(srcdir)
$(srcdir)/tests/actofgod-test $(srcdir)
$(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
@echo "$(srcdir)/tests/smoke-test SKIPPED"
@echo "$(srcdir)/tests/actofgod-test SKIPPED"
@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
+ $(srcdir)/tests/empdump-test $(srcdir)
### Implicit rules
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 $^ >$@