]> git.pond.sub.org Git - empserver/commitdiff
Make: Drop $(ttop), use its value directly
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 25 Jun 2016 11:01:01 +0000 (13:01 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 6 Aug 2017 18:09:17 +0000 (20:09 +0200)
info/TOP.t is easier to understand than $(ttop).

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Make.mk

diff --git a/Make.mk b/Make.mk
index bbb99f378e71da8f706b298ca95ce180c3fc2e63..29cd347276589e20d14c241b5cf0578d351bd4cd 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -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):
@@ -346,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))
@@ -360,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