Tweak for Debian packaging.

[open-adventure.git] / Makefile

diff --git a/Makefile b/Makefile
index d196a56bdec8ba333e9455d8256efe713ccf372b..70d004eebe364743e46b8a8c467331c20fb3d3a8 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)
 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: