Cleanups and clarifications in do_command()

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index 8be6564988b16ed4a7af7d3e204103df5356f509..62ec64a149d0049878f01a15fe134b21f954ad91 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
-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
+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
 SOURCES=$(OBJS:.o=.c) advent.h adventure.yaml Makefile control make_dungeon.py
 
 .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)
@@ -102,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
@@ -123,3 +121,6 @@ debug: CCFLAGS += -O0 --coverage -ggdb
 debug: linty
 debug: cheat
 
+CSUPPRESSIONS = --suppress=missingIncludeSystem --suppress=invalidscanf
+cppcheck:
+       cppcheck -I. --template gcc --enable=all $(CSUPPRESSIONS) *.[ch]