projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected limit for atloc, see init.c for filling double-linked list
[open-adventure.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 8be6564988b16ed4a7af7d3e204103df5356f509..506a6f6102a9e8a80da8b1edc0d8be53684eae2d 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-8,19
+8,16
@@
VERS=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
.PHONY: check coverage
CC?=gcc
.PHONY: check coverage
CC?=gcc
-CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -Wpedantic -O2
-LIBS=-ledit
-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
CHEAT_OBJS=cheat.o init.o actions.o score.o misc.o saveresume.o
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
+SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control make_dungeon.py
templates/*.tpl
.c.o:
.c.o:
- $(CC) $(CCFLAGS) $(DBX) -c $<
+ $(CC) $(CCFLAGS) $(
INC) $(
DBX) -c $<
advent: $(OBJS) dungeon.o
$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o $(LDFLAGS) $(LIBS)
advent: $(OBJS) dungeon.o
$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) dungeon.o $(LDFLAGS) $(LIBS)
@@
-42,8
+39,8
@@
saveresume.o: advent.h dungeon.h
dungeon.o: dungeon.c dungeon.h
$(CC) $(CCFLAGS) $(DBX) -c dungeon.c
dungeon.o: dungeon.c dungeon.h
$(CC) $(CCFLAGS) $(DBX) -c dungeon.c
-dungeon.c dungeon.h: make_dungeon.py adventure.yaml
-
python3
make_dungeon.py
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml
templates/*.tpl
+
./
make_dungeon.py
clean:
rm -f *.o advent cheat *.html *.gcno *.gcda
clean:
rm -f *.o advent cheat *.html *.gcno *.gcda
@@
-61,7
+58,7
@@
cheat: $(CHEAT_OBJS) dungeon.o
check: advent cheat
cd tests; $(MAKE) --quiet
check: advent cheat
cd tests; $(MAKE) --quiet
-coverage: debug
cheat
+coverage: debug
cd tests; $(MAKE) coverage --quiet
.SUFFIXES: .adoc .html .6
cd tests; $(MAKE) coverage --quiet
.SUFFIXES: .adoc .html .6
@@
-77,7
+74,7
@@
coverage: debug cheat
html: advent.html history.html hints.html
# README.adoc exists because that filename is magic on GitLab.
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.
TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
# Can't use GNU tar's --transform, needs to build under Alpine Linux.
@@
-102,6
+99,7
@@
dist: advent-$(VERS).tar.gz
linty: CCFLAGS += -W
linty: CCFLAGS += -Wall
linty: CCFLAGS += -Wextra
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 += -Wundef
linty: CCFLAGS += -Wstrict-prototypes
linty: CCFLAGS += -Wmissing-prototypes
@@
-117,9
+115,16
@@
linty: CCFLAGS += -Wwrite-strings
linty: CCFLAGS += -Wunreachable-code
linty: CCFLAGS += -Winit-self
linty: CCFLAGS += -Wpointer-arith
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
debug: linty
-debug: cheat
+CSUPPRESSIONS = --suppress=missingIncludeSystem --suppress=invalidscanf
+cppcheck:
+ cppcheck -I. --template gcc --enable=all $(CSUPPRESSIONS) *.[ch]