Make: Drop $(ttop), use its value directly

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index b535e9db0faab26725630b6533c0d5e9014f4e26..29cd347276589e20d14c241b5cf0578d351bd4cd 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-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2016, 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-2015
+#      Markus Armbruster, 2005-2016
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -125,7 +125,6 @@ client := src/client/empire$(EXEEXT)
 server := src/server/emp_server$(EXEEXT)
 # Info subjects:
 tsubj := $(addprefix info/, $(addsuffix .t, $(subjects)))
-ttop := info/TOP.t
 # Formatted info:
 info.nr := $(addprefix info.nr/, $(info))
 info.html := $(addprefix info.html/, $(addsuffix .html, $(info)))
@@ -156,7 +155,7 @@ endif
 # Each generated file should be in one of the following sets.
 # Removed by clean:
 clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj)   \
-$(ttop) $(info.all) $(empth_obj) $(empth_lib) sandbox
+info/toc info/TOP.t $(info.all) $(empth_obj) $(empth_lib) sandbox
 # Removed by distclean:
 distclean := $(ac) $(mk)
 # Distributed by dist-source from $(srcdir):
@@ -260,6 +259,8 @@ ifeq ($(empthread),LWP)
        $(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)
 else
        @echo "$(srcdir)/tests/smoke-test SKIPPED"
        @echo "$(srcdir)/tests/actofgod-test SKIPPED"
@@ -269,6 +270,8 @@ else
        @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"
 endif
        $(srcdir)/tests/empdump-test $(srcdir)
 
@@ -342,7 +345,7 @@ info/stamp-subj: info/mksubj.pl $(tsrc)
        $(call quiet-command,perl $(srcdir)/info/mksubj.pl $(subjects) $(filter %.t, $^),GEN '$(tsubj) info/toc')
        >$@
 
-$(ttop): info/mktop.pl info/subjects.mk
+info/TOP.t: info/mktop.pl info/subjects.mk
        $(call quiet-command,perl $(srcdir)/info/mktop.pl $@ $(subjects),GEN $@)
 
 info.nr/all: $(filter-out info.nr/all, $(info.nr))
@@ -356,7 +359,7 @@ $(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk
 
 $(info.html): info/emp2html.pl
 
-info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc)
+info.ps: info/TROFF.MAC info/INFO.MAC info/TOP.t $(tsubj) $(tsrc)
        groff $^ >$@
 
 # Distributing