empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
info/TOP.t is easier to understand than $(ttop).

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-25 13:01:01 +02:00
parent 93903e319c
commit 88698d73c7
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Make.mk
View file

@ -125,7 +125,6 @@ client := src/client/empire$(EXEEXT)
server := src/server/emp_server$(EXEEXT) server := src/server/emp_server$(EXEEXT)
# Info subjects: # Info subjects:
tsubj := $(addprefix info/, $(addsuffix .t, $(subjects))) tsubj := $(addprefix info/, $(addsuffix .t, $(subjects)))
ttop := info/TOP.t
# Formatted info: # Formatted info:
info.nr := $(addprefix info.nr/, $(info)) info.nr := $(addprefix info.nr/, $(info))
info.html := $(addprefix info.html/, $(addsuffix .html, $(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. # Each generated file should be in one of the following sets.
# Removed by clean: # Removed by clean:
clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj) \ 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: # Removed by distclean:
distclean := $(ac) $(mk) distclean := $(ac) $(mk)
# Distributed by dist-source from $(srcdir): # 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') $(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 $@) $(call quiet-command,perl $(srcdir)/info/mktop.pl $@ $(subjects),GEN $@)
info.nr/all: $(filter-out info.nr/all, $(info.nr)) 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.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 $^ >$@ groff $^ >$@
# Distributing # Distributing