cppcheck cleanup.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index d196a56bdec8ba333e9455d8256efe713ccf372b..92e97da6fff4ed32e38abb4b0c62c7b128dff679 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ VERS=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
 .PHONY: check coverage
 
 CC?=gcc
-CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all
+CCFLAGS+=-std=c99 -D_DEFAULT_SOURCE -DVERSION=\"$(VERS)\" -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all $(CFLAGS) -g
 LIBS=$(shell pkg-config --libs libedit)
 INC+=$(shell pkg-config --cflags libedit)
 
 # LLVM/Clang on macOS seems to need -ledit flag for linking
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
-    CCFLAGS += -ledit
+    LIBS += -ledit
 endif
 
 OBJS=main.o init.o actions.o score.o misc.o saveresume.o
@@ -45,7 +45,7 @@ saveresume.o: advent.h dungeon.h
 dungeon.o:     dungeon.c dungeon.h
        $(CC) $(CCFLAGS) $(DBX) -c dungeon.c
 
-dungeon.c dungeon.h: make_dungeon.py adventure.yaml templates/*.tpl
+dungeon.c dungeon.h: make_dungeon.py adventure.yaml advent.h templates/*.tpl
        ./make_dungeon.py
 
 clean:
@@ -64,6 +64,9 @@ cheat: $(CHEAT_OBJS) dungeon.o
 check: advent cheat
        cd tests; $(MAKE) --quiet
 
+# After this, run your browser on coverage/open-adventure/index.html
+# to see coverage results. Browse coverage/adventure.yaml.html
+# to see symbol coverage over the YAML file.
 coverage: debug
        cd tests; $(MAKE) coverage --quiet
 
@@ -136,3 +139,7 @@ debug: linty
 CSUPPRESSIONS = --suppress=missingIncludeSystem --suppress=invalidscanf
 cppcheck:
        cppcheck -I. --template gcc --enable=all $(CSUPPRESSIONS) *.[ch]
+
+PYSUPPRESSIONS = line-too-long,invalid-name,missing-function-docstring,too-many-lines,too-many-branches,global-statement,multiple-imports,too-many-locals,too-many-statements,too-many-nested-blocks,no-else-return,raise-missing-from,redefined-outer-name,consider-using-in
+pylint:
+       @pylint --score=n --disable=$(PYSUPPRESSIONS) *.py */*.py