asciidoc -> asciidoctor.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 2e81dfc3bb862e6c959869a6667cb58a87d7dae5..ea8fcd4732497d47ac75c616fe69d2d9de50da21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,14 @@ clean:
 cheat: $(CHEAT_OBJS) dungeon.o
        $(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) dungeon.o $(LDFLAGS) $(LIBS)
 
-check: advent cheat
+CSUPPRESSIONS = --suppress=missingIncludeSystem --suppress=invalidscanf
+cppcheck:
+       @-cppcheck -I. --quiet --template gcc -UPROP_SET_SEEN --enable=all $(CSUPPRESSIONS) *.[ch]
+
+pylint:
+       @-pylint --score=n *.py */*.py
+
+check: advent cheat pylint cppcheck
        cd tests; $(MAKE) --quiet
 
 reflow:
@@ -80,15 +87,16 @@ reflow:
 coverage: clean debug
        cd tests; $(MAKE) coverage --quiet
 
-.SUFFIXES: .adoc .html .6
+# Note: to suppress the footers with timestamps being generated in HTML,
+# we use "-a nofooter".
+# To debug asciidoc problems, you may need to run "xmllint --nonet --noout --valid"
+# on the intermediate XML that throws an error.
+.SUFFIXES: .html .adoc .6
 
-# Requires asciidoc and xsltproc/docbook stylesheets.
 .adoc.6:
-       a2x --doctype manpage --format manpage $<
+       asciidoctor -D. -a nofooter -b manpage $<
 .adoc.html:
-       asciidoc $<
-.adoc:
-       asciidoc $<
+       asciidoctor -D. -a nofooter -a webfonts! $<
 
 html: advent.html history.html hints.html
 
@@ -151,9 +159,3 @@ debug: CCFLAGS += -fsanitize=address
 debug: CCFLAGS += -fsanitize=undefined
 debug: linty
 
-CSUPPRESSIONS = --suppress=missingIncludeSystem --suppress=invalidscanf
-cppcheck:
-       cppcheck -I. --template gcc --enable=all $(CSUPPRESSIONS) *.[ch]
-
-pylint:
-       @pylint --score=n *.py */*.py