From dd57b41cfdff7b9a834ec17ae1575617acfcae2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Sun, 28 Feb 2016 12:26:53 +0100
Subject: build: do not modify $CFLAGS directly

These are picked-up by configure when building dependencies
during make standalone.
---
 config.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/config.mk b/config.mk
index 193881a..f083a99 100644
--- a/config.mk
+++ b/config.mk
@@ -25,10 +25,6 @@ ifeq (${CONFIG_LUA},1)
 	LDFLAGS_LUA = $(shell pkg-config --libs lua5.2 2> /dev/null || echo "-llua -lm")
 endif
 
-CFLAGS += -DCONFIG_LUA=${CONFIG_LUA}
-CFLAGS += -DCONFIG_SELINUX=${CONFIG_SELINUX}
-CFLAGS += -DCONFIG_ACL=${CONFIG_ACL}
-
 ifeq (${CONFIG_ACL},1)
 	LIBS += -lacl
 endif
@@ -54,7 +50,16 @@ endif
 CFLAGS_LIBS = $(CFLAGS_LUA) $(CFLAGS_TERMKEY) $(CFLAGS_CURSES)
 LDFLAGS_LIBS = $(LDFLAGS_LUA) $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) $(LIBS)
 
-CFLAGS_VIS = $(CFLAGS_LIBS) -std=c99 -Os -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -DLUA_COMPAT_ALL
+CFLAGS_STD = -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
+
+CFLAGS_VIS = $(CFLAGS_LIBS) $(CFLAGS_STD) -Os -DVERSION=\"${VERSION}\" -DNDEBUG
+CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA}
+CFLAGS_VIS += -DCONFIG_SELINUX=${CONFIG_SELINUX}
+CFLAGS_VIS += -DCONFIG_ACL=${CONFIG_ACL}
+ifeq (${CONFIG_LUA},1)
+	CFLAGS_VIS += -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -DLUA_COMPAT_ALL
+endif
+
 LDFLAGS_VIS = $(LDFLAGS_LIBS)
 
 DEBUG_CFLAGS_VIS = ${CFLAGS_VIS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -pedantic -Wno-missing-field-initializers -Wno-unused-parameter
-- 
cgit v1.2.3