prnat() prnatid(): New, common country name (#number) formatting

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index 9e222218a58a476bbbae9f5dc3bda8a922b01910..3ae4ed69b5f3400e04d58f0c84c882f02e5c8b62 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -62,8 +62,6 @@ include $(srcdir)/info/subjects.mk
 # Abbreviations
 topics := $(patsubst %.t,%,$(notdir $(tsrc)))
 info := $(topics) $(subjects) all TOP
-subjects.html := $(addprefix info.html/, $(addsuffix .html, $(subjects)))
-topics.html := $(addprefix info.html/, $(addsuffix .html, $(topics)))
 scripts := $(srcdir)/src/scripts
 depcomp := $(SHELL) $(srcdir)/depcomp
 tarball := $(SHELL) -e $(scripts)/tarball
@@ -180,9 +178,6 @@ endif
 $(client): LDLIBS := $(LIBS_client)
 $(server): LDLIBS := $(LIBS_server)
 
-# Self-tests
-checks := check-smoke
-
 
 ### Advertized goals
 
@@ -250,11 +245,9 @@ uninstall:
 .PHONY: dist
 dist: dist-source dist-client dist-info
 
-.PHONY: check $(checks)
-check: $(checks)
-$(checks): all
-check-smoke:
-       @echo "Warning: smoke test is immature and needs work." >&2
+.PHONY: check
+check: all
+       @echo "Warning: test suite is immature and needs work." >&2
        $(srcdir)/tests/files-test $(srcdir)
        $(srcdir)/tests/fairland-test $(srcdir)
 ifeq ($(empthread),LWP)
@@ -262,6 +255,7 @@ ifeq ($(empthread),LWP)
 else
        @echo "$(srcdir)/tests/smoke-test SKIPPED"
 endif
+       @echo "$(srcdir)/tests/actofgod-test SKIPPED"
 
 
 ### Implicit rules
@@ -295,7 +289,7 @@ info.nr/%: info/%.t
 # Pipes in make are a pain.  The "test -s" catches obvious errors.
 
 info.html/%.html: info/%.t
-       perl $(filter %.pl, $^) $< >$@
+       $(call quiet-command,perl $(srcdir)/info/emp2html.pl $(info) <$< >$@,GEN $@)
 
 
 ### Explicit rules
@@ -345,8 +339,7 @@ info.html/all.html: info.nr/all info/ls2html.pl
 
 $(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk
 
-$(subjects.html) info.html/TOP.html: info/subj2html.pl
-$(topics.html): info/emp2html.pl
+$(info.html): info/emp2html.pl
 
 info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc)
        groff $^ >$@