vis

commit 9f660a46b31bec8177e7d88893c8ba4330b801ed
parent dfc918977edf4142e6c9095f37af2b8ac44eda82
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Thu, 15 Dec 2016 20:20:03 +0100

build: move $CFLAGS_DEBUG into config.mk

This allows inclusion in other Makefiles (e.g. for C unit tests).

Diffstat:
M
Makefile
 | 
14
+++++---------
M
configure
 | 
1
+

2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
@@ -32,14 +32,10 @@ CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA}
 CFLAGS_VIS += -DCONFIG_LPEG=${CONFIG_LPEG}
 CFLAGS_VIS += -DCONFIG_SELINUX=${CONFIG_SELINUX}
 CFLAGS_VIS += -DCONFIG_ACL=${CONFIG_ACL}
-CFLAGS_VIS += ${CFLAGS_DEBUG}
 
 LDFLAGS_VIS = $(LDFLAGS_AUTO) $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) $(LDFLAGS_ACL) \
 	$(LDFLAGS_SELINUX) $(LDFLAGS_LUA) $(LDFLAGS_LPEG) $(LDFLAGS_STD)
 
-CFLAGS_DEBUG_ENABLE = -U_FORTIFY_SOURCE -UNDEBUG -O0 -g -ggdb -Wall -Wextra -pedantic \
-	-Wno-missing-field-initializers -Wno-unused-parameter
-
 STRIP?=strip
 
 all: vis vis-menu
@@ -51,19 +47,19 @@ config.mk:
 	@touch $@
 
 vis: config.h config.mk *.c *.h
-	${CC} ${CFLAGS} ${CFLAGS_VIS} ${SRC} ${LDFLAGS} ${LDFLAGS_VIS} -o $@
+	${CC} ${CFLAGS} ${CFLAGS_VIS} ${CFLAGS_EXTRA} ${SRC} ${LDFLAGS} ${LDFLAGS_VIS} -o $@
 
 vis-menu: vis-menu.c
-	${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_AUTO} ${CFLAGS_DEBUG} $< ${LDFLAGS} ${LDFLAGS_STD} ${LDFLAGS_AUTO} -o $@
+	${CC} ${CFLAGS} ${CFLAGS_AUTO} ${CFLAGS_STD} ${CFLAGS_EXTRA} $< ${LDFLAGS} ${LDFLAGS_STD} ${LDFLAGS_AUTO} -o $@
 
 debug: clean
-	@$(MAKE) CFLAGS_DEBUG='${CFLAGS_DEBUG_ENABLE}'
+	@$(MAKE) CFLAGS_EXTRA='${CFLAGS_DEBUG}'
 
 profile: clean
-	@$(MAKE) CFLAGS_DEBUG='${CFLAGS_DEBUG_ENABLE} -pg'
+	@$(MAKE) CFLAGS_EXTRA='${CFLAGS_DEBUG} -pg'
 
 coverage: clean
-	@$(MAKE) CFLAGS_DEBUG='--coverage'
+	@$(MAKE) CFLAGS_EXTRA='--coverage'
 
 test-update:
 	git submodule init
diff --git a/configure b/configure
@@ -264,6 +264,7 @@ CFLAGS_STD = $CFLAGS_STD
 LDFLAGS_STD = $LDFLAGS_STD
 CFLAGS_AUTO = $CFLAGS_AUTO
 LDFLAGS_AUTO = $LDFLAGS_AUTO
+CFLAGS_DEBUG = -U_FORTIFY_SOURCE -UNDEBUG -O0 -g -ggdb -Wall -Wextra -pedantic -Wno-missing-field-initializers -Wno-unused-parameter
 EOF
 exec 1>&3 3>&-