Put some of important parameters into fixed width signed integers

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index cc87a2b3f12a7fd10d49c2669bb00d070b140d9a..506a6f6102a9e8a80da8b1edc0d8be53684eae2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,90 +1,66 @@
 # Makefile for the open-source release of adventure 2.5
 
-# Note: If you're building from the repository rather than the source tarball,
-# do this to get the linenoise library where you can use it:
-#
-# git submodule update --recursive --remote --init
-#
-# Therafter, you can update it like this:
-#
-# git submodule update --recursive --remote
-#
-# but this should seldom be necessary as that library is pretty stable.
-#
-# You will also need Python 3 YAML.  Under Debian or ubuntu:
-#
-# apt-get install python3-yaml
-#
-# If you have pip installed,
-#
-# pip3 install PyYAML
-#
-# If you are using MacPorts on OS X:
-# port install py3{5,6}-yaml as appropriate for your Python 3 version.
-#
 # 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
+.PHONY: check coverage
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wpedantic -O2
-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 actions.o score.o misc.o saveresume.o common.o
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text 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 make_dungeon.py templates/*.tpl
 
 .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
+       $(CC) $(CCFLAGS) $(INC) $(DBX) -c $<
 
-actions.o:     advent.h database.h common.h newdb.h
+advent:        $(OBJS) dungeon.o
+       $(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.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
 
-saveresume.o:  advent.h database.h common.h newdb.h
+actions.o:     advent.h dungeon.h
 
-common.o:      common.h
+score.o:       advent.h dungeon.h
 
-newdb.o:       newdb.c newdb.h
-       $(CC) $(CCFLAGS) $(DBX) -c newdb.c
+misc.o:                advent.h dungeon.h
 
-database.h: dungeon
-       ./dungeon
+cheat.o:       advent.h dungeon.h
 
-newdb.c newdb.h:
-       python3 newdungeon.py
+saveresume.o:  advent.h dungeon.h
 
-linenoise.o:   linenoise/linenoise.h
-       $(CC) -c linenoise/linenoise.c
+dungeon.o:     dungeon.c dungeon.h
+       $(CC) $(CCFLAGS) $(DBX) -c dungeon.c
 
-dungeon: dungeon.o common.o
-       $(CC) $(CCFLAGS) -o $@ dungeon.o common.o
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml templates/*.tpl
+       ./make_dungeon.py
 
 clean:
-       rm -f *.o advent *.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
 
-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
+       cd tests; $(MAKE) coverage --quiet
+
 .SUFFIXES: .adoc .html .6
 
 # Requires asciidoc and xsltproc/docbook stylesheets.
@@ -98,7 +74,7 @@ check: advent
 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 notes.adoc hints.adoc advent.6
+DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc notes.adoc hints.adoc advent.6 INSTALL.adoc
 TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
 
 # Can't use GNU tar's --transform, needs to build under Alpine Linux.
@@ -123,6 +99,7 @@ dist: advent-$(VERS).tar.gz
 linty: CCFLAGS += -W
 linty: CCFLAGS += -Wall
 linty: CCFLAGS += -Wextra
+linty: CCGLAGS += -Wpedantic
 linty: CCFLAGS += -Wundef
 linty: CCFLAGS += -Wstrict-prototypes
 linty: CCFLAGS += -Wmissing-prototypes
@@ -138,7 +115,16 @@ linty: CCFLAGS += -Wwrite-strings
 linty: CCFLAGS += -Wunreachable-code
 linty: CCFLAGS += -Winit-self
 linty: CCFLAGS += -Wpointer-arith
-linty: advent
-
-debug: CCFLAGS += -O0 --coverage -ggdb
+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]