Remove obsolete comment part.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 978d5a8912c927cd7ffdf33191d22c8015e49e7d..88c59e6e60c46d3ec5855b94f93f6f7647ef5067 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ VERS=$(shell sed -n <NEWS.adoc '/^[0-9]/s/:.*//p' | head -1)
 .PHONY: check coverage
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all $(CFLAGS) -g $(EXTRA)
+CCFLAGS+=-std=c99 -Wall -Wextra -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all $(CFLAGS) -g $(EXTRA)
 LIBS=$(shell pkg-config --libs libedit)
 INC+=$(shell pkg-config --cflags libedit)
 
@@ -67,7 +67,7 @@ cheat: $(CHEAT_OBJS) dungeon.o
 
 CSUPPRESSIONS = --suppress=missingIncludeSystem --suppress=invalidscanf
 cppcheck:
-       @-cppcheck -I. --quiet --template gcc -UPROP_SET_SEEN --enable=all $(CSUPPRESSIONS) *.[ch]
+       @-cppcheck -I. --quiet --template gcc -UOBJECT_SET_SEEN --enable=all $(CSUPPRESSIONS) *.[ch]
 
 pylint:
        @-pylint --score=n *.py */*.py
@@ -87,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
 
@@ -111,9 +112,6 @@ advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
        (tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
        @(rm advent-$(VERS))
 
-indent:
-       astyle -n -A3 --pad-header --min-conditional-indent=1 --pad-oper *.c
-
 release: advent-$(VERS).tar.gz advent.html history.html hints.html notes.html
        shipper version=$(VERS) | sh -e -x