Ready to ship 1.10

[wumpus.git] / Makefile

diff --git a/Makefile b/Makefile
index 6b19476b194fd1d1d28b578e181acee90d37f2ca..c1ceb6fc7bcf895b0e2977259f304d9bdd89e506 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 #
 # Makefile for `Hunt the Wumpus' and `Superhack' games
 #
 #
 # Makefile for `Hunt the Wumpus' and `Superhack' games
 #

-VERS=1.6
+# SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
+# SPDX-License-Identifier: BSD-2-Clause
+
+VERS=$(shell sed -n <NEWS.adoc '/^[0-9]/s/:.*//p' | head -1)

 
 prefix?=/usr
 
 
 prefix?=/usr
 


@@ -16,19 +19,24 @@ superhack: superhack.c
        $(CC) $(CFLAGS) superhack.c -o superhack
 
 clean:
        $(CC) $(CFLAGS) superhack.c -o superhack
 
 clean:

-       rm -f wumpus wumpus.o superhack superhack.o TAGS 
+       rm -f wumpus wumpus.o superhack superhack.o TAGS *.6 

        rm -f *~ *.1 *.html *.tar.gz MANIFEST
 
 TAGS:
        etags wumpus.c
 
        rm -f *~ *.1 *.html *.tar.gz MANIFEST
 
 TAGS:
        etags wumpus.c
 

-wumpus.6: wumpus.xml
-       xmlto man wumpus.xml 
+# 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

 
 

-wumpus.html: wumpus.xml
-       xmlto html-nochunks wumpus.xml 
+.adoc.6:
+       asciidoctor -D. -a nofooter -b manpage $<
+.adoc.html:
+       asciidoctor -D. -a nofooter -a webfonts! $<

 
 

-SOURCES = README COPYING NEWS control Makefile wumpus.c superhack.c wumpus.xml wumpus.png wumpus.desktop superhack.desktop
+SOURCES = README.adoc COPYING NEWS.adoc control Makefile wumpus.c superhack.c wumpus.adoc wumpus.png wumpus.desktop superhack.desktop

 
 install: wumpus superhack wumpus.6
        mkdir -p $(prefix)/bin
 
 install: wumpus superhack wumpus.6
        mkdir -p $(prefix)/bin


@@ -40,6 +48,9 @@ uninstall:
        rm $(prefix)/bin/wumpus $(prefix)/bin/superhack
        rm $(prefix)/share/man/man6/wumpus.6
 
        rm $(prefix)/bin/wumpus $(prefix)/bin/superhack
        rm $(prefix)/share/man/man6/wumpus.6
 

+reflow:
+       @clang-format --style="{IndentWidth: 8, UseTab: ForIndentation}" -i $$(find . -name "*.[ch]")
+

 CPPCHECKOPTS =
 cppcheck:
        cppcheck -DREVISION=$(VERS) $(CPPCHECKOPTS) wumpus.c
 CPPCHECKOPTS =
 cppcheck:
        cppcheck -DREVISION=$(VERS) $(CPPCHECKOPTS) wumpus.c


@@ -53,7 +64,7 @@ wumpus-$(VERS).tar.gz: $(SOURCES) wumpus.6
 
 dist: wumpus-$(VERS).tar.gz
 
 
 dist: wumpus-$(VERS).tar.gz
 

-release: wumpus-$(VERS).tar.gz wumpus.html
+release: wumpus-$(VERS).tar.gz wumpus.html wumpus.6

        shipper version=$(VERS) | sh -e -x
 
 refresh: wumpus.html
        shipper version=$(VERS) | sh -e -x
 
 refresh: wumpus.html