Implement and document %V escape so version only needs to be set once.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index d9436e0d7633ec0acb01977cdb4644b8b5ac385f..2e6997a5393c8cddecaae56cec4d95eef4fd6167 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,76 +24,73 @@
 #
 # To build with save/resume disabled, pass CCFLAGS="-D ADVENT_NOSAVE"
 
-.PHONY: debug indent release refresh dist linty html clean
+VERS=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
 
-VERS=1.0
+.PHONY: debug indent release refresh dist linty html clean
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -O2
+CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -Wpedantic -O2
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
        LIBS=-lrt
 endif
 
-OBJS=main.o init.o actions.o score.o misc.o saveresume.o common.o
-CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o common.o
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text adventure.yaml Makefile control linenoise/linenoise.[ch] newdungeon.py
+OBJS=main.o init.o actions.o score.o misc.o saveresume.o
+CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o
+SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control linenoise/linenoise.[ch] make_dungeon.py
 
 .c.o:
        $(CC) $(CCFLAGS) $(DBX) -c $<
 
-advent:        $(OBJS) linenoise.o newdb.o
-       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
-
-main.o:                advent.h database.h common.h newdb.h
-
-init.o:                advent.h database.h common.h newdb.h
-
-actions.o:     advent.h database.h common.h newdb.h
+advent:        $(OBJS) linenoise.o dungeon.o
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o linenoise.o $(LDFLAGS) $(LIBS)
 
-score.o:       advent.h database.h common.h newdb.h
+main.o:                advent.h dungeon.h
 
-misc.o:                advent.h database.h common.h newdb.h
+init.o:                advent.h dungeon.h
 
-cheat.o:       advent.h database.h common.h newdb.h
+actions.o:     advent.h dungeon.h
 
-saveresume.o:  advent.h database.h common.h newdb.h
+score.o:       advent.h dungeon.h
 
-common.o:      common.h
+misc.o:                advent.h dungeon.h
 
-dungeon.o:     common.h newdb.h
+cheat.o:       advent.h dungeon.h
 
-newdb.o:       newdb.c newdb.h
-       $(CC) $(CCFLAGS) $(DBX) -c newdb.c
+saveresume.o:  advent.h dungeon.h
 
-database.h: dungeon
-       ./dungeon
+dungeon.o:     dungeon.c dungeon.h
+       $(CC) $(CCFLAGS) $(DBX) -c dungeon.c
 
-newdb.c newdb.h: newdungeon.py adventure.yaml
-       python3 newdungeon.py
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml
+       python3 make_dungeon.py
 
 linenoise.o:   linenoise/linenoise.h
-       $(CC) $(CCFLAGS) -c linenoise/linenoise.c
+       $(CC) -c linenoise/linenoise.c
 
-dungeon: dungeon.o common.o
-       $(CC) $(CCFLAGS) -o $@ dungeon.o common.o
+linenoise-dbg: linenoise/linenoise.h
+       $(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 clean:
-       rm -f *.o advent cheat *.html database.h dungeon *.gcno *.gcda
-       rm -f newdb.c newdb.h
+       rm -f *.o advent cheat *.html *.gcno *.gcda
+       rm -f dungeon.c dungeon.h
        rm -f README advent.6 MANIFEST *.tar.gz
        rm -f *~
        rm -f .*~
+       rm -rf coverage advent.info
        cd tests; $(MAKE) --quiet clean
 
 
-cheat: $(CHEAT_OBJS) linenoise.o newdb.o 
-       $(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o newdb.o $(LDFLAGS) $(LIBS)
+cheat: $(CHEAT_OBJS) linenoise.o dungeon.o 
+       $(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) linenoise.o dungeon.o $(LDFLAGS) $(LIBS)
 
 check: advent cheat
        cd tests; $(MAKE) --quiet
 
+coverage: debug cheat
+       cd tests; $(MAKE) coverage --quiet
+
 .SUFFIXES: .adoc .html .6
 
 # Requires asciidoc and xsltproc/docbook stylesheets.
@@ -153,7 +150,4 @@ debug: CCFLAGS += -O0 --coverage -ggdb
 debug: linty
 debug: cheat
 
-coverage: debug check
-       lcov -t "advent" -o advent.info -c -d .
-       genhtml -o coverage/ advent.info
-
+debug-ln: linenoise-dbg debug