Update change log again for 4.3.33

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index f667b4d2e0e47032dc3bfa9a94946ad8fa66fb10..3468f54b579a4363da6ae8156b12f19cad296d1b 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-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
@@ -27,7 +27,7 @@
 #   Make.mk: The real Makefile, included by GNUmakefile
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2013
+#      Markus Armbruster, 2005-2015
 #
 
 # 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
@@ -249,18 +249,35 @@ uninstall:
 .PHONY: dist
 dist: dist-source dist-client dist-info
 
-.PHONY: check
-check: all
+.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/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
@@ -321,15 +338,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