X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=3416853cb7d69c77a1495565cd9d9404c493319f;hp=421c82dbbad0ca8641b434afa5c66d7a12bdbbee;hb=f69db5e4130c9d60b33e8ce8fed4bad8c94b60af;hpb=10ddaca6b12cda2766269e9fc59f7612ad0da01a

diff --git a/Make.mk b/Make.mk
index 421c82dbb..3416853cb 100644
--- a/Make.mk
+++ b/Make.mk
@@ -1,6 +1,6 @@
 #
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2021, 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-2017
+#      Markus Armbruster, 2005-2020
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -48,12 +48,16 @@ all:
 ifeq ($(revctrl),git)
 src := $(shell cd $(srcdir) && git ls-files | uniq)
 version := $(shell cd $(srcdir) && build-aux/git-version-gen /dev/null)
+ifeq ($(version),UNKNOWN)
+$(warning cannot figure out version number, falling back to git hash)
+version := UNKNOWN-$(shell cd $(srcdir) && git-rev-parse --verify --short HEAD || echo "UNKNOWN")
+endif
 else
 include $(srcdir)/sources.mk
 version := $(shell cat $(srcdir)/.tarball-version || echo "UNKNOWN")
 endif
 ifeq ($(version),UNKNOWN)
-$(error cannot figure out version)
+$(error cannot figure out version number)
 endif
 dirs := $(sort $(dir $(src)))
 csrc := $(filter %.c, $(src))
@@ -68,7 +72,7 @@ include $(srcdir)/info/subjects.mk
 topics := $(patsubst %.t,%,$(notdir $(tsrc)))
 info := $(topics) $(subjects) all TOP
 scripts := $(srcdir)/src/scripts
-depcomp := $(SHELL) $(srcdir)/depcomp
+depcomp := $(SHELL) $(srcdir)/build-aux/depcomp
 tarball := $(SHELL) -e $(scripts)/tarball
 econfig := $(sysconfdir)/empire/econfig
 schedule := $(sysconfdir)/empire/schedule
@@ -93,6 +97,11 @@ else
 quiet-command = @echo $2 && $1
 endif
 
+# Helper for running tests
+# Usage: $(call run-test, SHELL-SCRIPT)
+# Recursively expanded, or else parameters don't work
+run-test = $(call quiet-command, $(SHELL) -e $1 $(srcdir), TEST $1)
+
 # How to substitute Autoconf output variables
 # Recursively expanded so that $@ and $< work.
 subst.in = sed \
@@ -249,33 +258,35 @@ 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)
+	$(call run-test, $(srcdir)/tests/files-test)
+	$(call run-test, $(srcdir)/tests/fairland-test)
+	$(call run-test, $(srcdir)/tests/info-test)
 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)
-	$(srcdir)/tests/update-test $(srcdir)
-	$(srcdir)/tests/version-test $(srcdir)
+	$(call run-test, $(srcdir)/tests/smoke-test)
+	$(call run-test, $(srcdir)/tests/actofgod-test)
+	$(call run-test, $(srcdir)/tests/build-test)
+	$(call run-test, $(srcdir)/tests/load-tend-test)
+	$(call run-test, $(srcdir)/tests/navi-march-test)
+	$(call run-test, $(srcdir)/tests/fire-test)
+	$(call run-test, $(srcdir)/tests/torpedo-test)
+	$(call run-test, $(srcdir)/tests/bridgefall-test)
+	$(call run-test, $(srcdir)/tests/retreat-test)
+	$(call run-test, $(srcdir)/tests/update-test)
+	$(call run-test, $(srcdir)/tests/version-test)
 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"
-	@echo "$(srcdir)/tests/update-test SKIPPED"
-	@echo "$(srcdir)/tests/version-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/smoke-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/actofgod-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/build-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/load-tend-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/navi-march-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/fire-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/torpedo-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/bridgefall-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/retreat-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/update-test SKIPPED"
+	@echo "TEST $(srcdir)/tests/version-test SKIPPED"
 endif
-	$(srcdir)/tests/empdump-test $(srcdir)
+	$(call run-test, $(srcdir)/tests/empdump-test)
 
 
 ### Implicit rules
@@ -342,7 +353,7 @@ $(srcdir)/.tarball-version: $(src)
 	v=`sed -e 's/-dirty$$//' <$@`; echo "$$v-dirty" >$@
 # Force Make to start over after updating .tarball-version, so that
 # $(version) gets the new value
-$(srcdir)/.dirty-stamp: .tarball-version
+$(srcdir)/.dirty-stamp: $(srcdir)/.tarball-version
 	>$@
 include $(srcdir)/.dirty-stamp
 endif