Use ASan and UBSan in debug builds.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 3b9509dfd7065ab44a21261770272f9909bbd412..ed13d890f47ef9d5251dc1c8448c9e0b918dbf42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,66 @@
 # Makefile for the open-source release of adventure 2.5
 
-VERS=1.0
+# To build with save/resume disabled, pass CCFLAGS="-D ADVENT_NOSAVE"
+
+VERS=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
+
+.PHONY: debug indent release refresh dist linty html clean
+.PHONY: check coverage
 
 CC?=gcc
-CCFLAGS+=-std=c99
-LIBS=
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Linux)
-       LIBS=-lrt
-endif
+CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all
+LIBS=$(shell pkg-config --libs libedit)
+INC+=$(shell pkg-config --cflags libedit)
 
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
-SOURCES=$(OBJS:.o=.c) compile.c advent.h funcs.h adventure.text Makefile control
+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 make_dungeon.py
 
 .c.o:
-       $(CC) $(CCFLAGS) $(DBX) -c $<
-
-advent:        $(OBJS) database.o
-       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
+       $(CC) $(CCFLAGS) $(INC) $(DBX) -c $<
 
-main.o:                advent.h funcs.h database.h
+advent:        $(OBJS) dungeon.o
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o $(LDFLAGS) $(LIBS)
 
-init.o:                advent.h funcs.h database.h
+main.o:                advent.h dungeon.h
 
-actions1.o:    advent.h funcs.h database.h
+init.o:                advent.h dungeon.h
 
-actions2.o:    advent.h funcs.h
+actions.o:     advent.h dungeon.h
 
-score.o:       advent.h database.h
+score.o:       advent.h dungeon.h
 
-misc.o:                advent.h database.h
+misc.o:                advent.h dungeon.h
 
-database.o:    database.h
+cheat.o:       advent.h dungeon.h
 
-compile: compile.c
-       $(CC) $(CCFLAGS) -o $@ $<
+saveresume.o:  advent.h dungeon.h
 
-database.c database.h: compile adventure.text
-       ./compile
-       $(CC) $(CCFLAGS) $(DBX) -c database.c
+dungeon.o:     dungeon.c dungeon.h
+       $(CC) $(CCFLAGS) $(DBX) -c dungeon.c
 
-html: index.html advent.html history.html hints.html
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml
+       ./make_dungeon.py
 
 clean:
-       rm -f *.o advent *.html database.[ch] compile *.gcno *.gcda
-       rm -f README advent.6 MANIFEST
+       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
 
-check: advent
+
+cheat: $(CHEAT_OBJS) dungeon.o
+       $(CC) $(CCFLAGS) $(DBX) -o cheat $(CHEAT_OBJS) 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.
@@ -60,18 +71,60 @@ check: advent
 .adoc:
        asciidoc $<
 
+html: advent.html history.html hints.html
+
 # README.adoc exists because that filename is magic on GitLab.
-DOCS=COPYING NEWS README.adoc TODO \
-       advent.adoc history.adoc index.adoc hints.adoc advent.6
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc notes.adoc hints.adoc advent.6
+TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
+
+# Can't use GNU tar's --transform, needs to build under Alpine Linux.
+# This is a requirement for testing dist in GitLab's CI pipeline
+advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
+       @find $(SOURCES) $(DOCS) $(TESTFILES) -print | sed s:^:advent-$(VERS)/: >MANIFEST
+       @(ln -s . advent-$(VERS))
+       (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
 
-# Can't use GNU tar's --transform, needs to build under Alpine Linux
-advent-$(VERS).tar.gz: $(SOURCES) $(DOCS) advent.6
-       @ls $(SOURCES) $(DOCS) advent.6 | sed s:^:advent-$(VERS)/: >MANIFEST
-       @(cd ..; ln -s advent advent-$(VERS))
-       (cd ..; tar -czvf advent/advent-$(VERS).tar.gz `cat advent/MANIFEST`)
-       @(cd ..; rm advent-$(VERS))
+refresh: advent.html notes.html history.html
+       shipper -N -w version=$(VERS) | sh -e -x
 
 dist: advent-$(VERS).tar.gz
 
-debug: CCFLAGS += -O0 --coverage
-debug: advent
+linty: CCFLAGS += -W
+linty: CCFLAGS += -Wall
+linty: CCFLAGS += -Wextra
+linty: CCGLAGS += -Wpedantic
+linty: CCFLAGS += -Wundef
+linty: CCFLAGS += -Wstrict-prototypes
+linty: CCFLAGS += -Wmissing-prototypes
+linty: CCFLAGS += -Wmissing-declarations
+linty: CCFLAGS += -Wshadow
+linty: CCFLAGS += -Wfloat-equal
+linty: CCFLAGS += -Wcast-align
+linty: CCFLAGS += -Wwrite-strings
+linty: CCFLAGS += -Waggregate-return
+linty: CCFLAGS += -Wcast-qual
+linty: CCFLAGS += -Wswitch-enum
+linty: CCFLAGS += -Wwrite-strings
+linty: CCFLAGS += -Wunreachable-code
+linty: CCFLAGS += -Winit-self
+linty: CCFLAGS += -Wpointer-arith
+linty: advent cheat
+
+debug: CCFLAGS += -O0
+debug: CCFLAGS += --coverage
+debug: CCFLAGS += -ggdb
+debug: CCFLAGS += -U_FORTIFY_SOURCE
+debug: CCFLAGS += -fsanitize=address
+debug: CCFLAGS += -fsanitize=undefined
+debug: linty
+
+CSUPPRESSIONS = --suppress=missingIncludeSystem --suppress=invalidscanf
+cppcheck:
+       cppcheck -I. --template gcc --enable=all $(CSUPPRESSIONS) *.[ch]