Revert "retreat: Oops on retreating ghosts"

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index 87968b6bace2be7818f718317c168638731a4f1b..e0af8b472d6c1c08c172ff092e99b2c5057bfd87 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -1,6 +1,6 @@
 #
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2013, 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
@@ -27,7 +27,7 @@
 #   Make.mk: The real Makefile, included by GNUmakefile
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2012
+#      Markus Armbruster, 2005-2014
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -46,7 +46,7 @@ all:
 
 # 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
@@ -68,9 +68,10 @@ tarball := $(SHELL) -e $(scripts)/tarball
 econfig := $(sysconfdir)/empire/econfig
 schedule := $(sysconfdir)/empire/schedule
 gamedir := $(localstatedir)/empire
-builtindir := $(datadir)/empire/builtin
-einfodir := $(datadir)/empire/info.nr
-ehtmldir := $(datadir)/empire/info.html
+edatadir := $(datadir)/empire
+builtindir := $(edatadir)/builtin
+einfodir := $(edatadir)/info.nr
+ehtmldir := $(edatadir)/info.html
 client/w32 := arpa/inet.h netdb.h netinet/in.h sys/time.h sys/socket.h \
 sys/uio.h unistd.h w32io.c w32sockets.c w32types.h
 
@@ -178,9 +179,6 @@ endif
 $(client): LDLIBS := $(LIBS_client)
 $(server): LDLIBS := $(LIBS_server)
 
-# Self-tests
-checks := check-smoke
-
 
 ### Advertized goals
 
@@ -204,6 +202,7 @@ install: all installdirs
        $(INSTALL_PROGRAM) $(util) $(server) $(sbindir)
        $(INSTALL_PROGRAM) $(client) $(bindir)
        $(INSTALL) -m 444 $(addprefix $(srcdir)/, $(builtins)) $(builtindir)
+       rm -f $(einfodir)/*
        $(INSTALL_DATA) $(info.nr) $(einfodir)
        $(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(mandir)/man6
        sed -e '1,/^$$/d' -e 's/^/# /g' <$(srcdir)/doc/schedule >$(schedule).dist
@@ -235,31 +234,48 @@ installdirs:
 .PHONY: install-html
 install-html: html
        mkdir -p $(ehtmldir)
+       rm -f $(ehtmldir)/*
        $(INSTALL_DATA) $(info.html) $(ehtmldir)
 
 .PHONY: uninstall
 uninstall:
        rm -f $(addprefix $(sbindir)/, $(notdir $(util) $(server)))
        rm -f $(addprefix $(bindir)/, $(notdir $(client)))
-       rm -rf $(builtindir) $(einfodir)
+       rm -rf $(builtindir) $(einfodir) $(ehtmldir)
+       rmdir $(edatadir)
        rm -f $(addprefix $(mandir)/man6/, $(notdir $(man6)))
        @echo "$(dir $(econfig)) and $(gamedir) not removed, you may wish to remove it manually."
 
 .PHONY: dist
 dist: dist-source dist-client dist-info
 
-.PHONY: check $(checks)
-check: $(checks)
-$(checks): all
-check-smoke:
-       @echo "Warning: smoke test is immature and needs work." >&2
+.PHONY: check check-accept _check
+check check-accept: _check
+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/fairland-test $(srcdir)
+       $(srcdir)/tests/info-test $(srcdir)
 ifeq ($(empthread),LWP)
        $(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/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/bridgefall-test SKIPPED"
+       @echo "$(srcdir)/tests/retreat-test SKIPPED"
 endif
+       $(srcdir)/tests/empdump-test $(srcdir)
 
 
 ### Implicit rules
@@ -293,7 +309,7 @@ info.nr/%: info/%.t
 # Pipes in make are a pain.  The "test -s" catches obvious errors.
 
 info.html/%.html: info/%.t
-       perl $(srcdir)/info/emp2html.pl $< >$@
+       $(call quiet-command,perl $(srcdir)/info/emp2html.pl $(info) <$< >$@,GEN $@)
 
 
 ### Explicit rules
@@ -320,15 +336,15 @@ $(libs) $(empth_lib):
 
 # Info formatting
 
-# mksubj.pl reads $(tsrc) and writes $(tsubj).  The naive rule
-#     $(ttop) $(tsubj): $(tsrc)
+# mksubj.pl reads $(tsrc) and writes $(tsubj).  A naive rule
+#     $(tsubj): $(tsrc)
 #           COMMAND
 # runs COMMAND once for each target.  That's because multiple targets
 # in an explicit rule is just a shorthand for one rule per target,
 # each with the same prerequisites and commands.  Use a stamp file.
-$(tsubj): info/stamp-subj ;
+$(tsubj) info/toc: info/stamp-subj ;
 info/stamp-subj: info/mksubj.pl $(tsrc)
-       $(call quiet-command,perl $(srcdir)/info/mksubj.pl $(subjects) $(filter %.t, $^),GEN '$$(subjects)')
+       $(call quiet-command,perl $(srcdir)/info/mksubj.pl $(subjects) $(filter %.t, $^),GEN '$(tsubj) info/toc')
        >$@
 
 $(ttop): info/mktop.pl info/subjects.mk