From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 23 Jan 2018 12:51:04 +0000 (+0100)
Subject: make: CFLAGS cleanup
X-Git-Tag: v1.5.3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dff269b889d62996da86be672e9a5bd5822cdb5b;p=thirdparty%2Fknot-resolver.git

make: CFLAGS cleanup

Readability, and don't -I embedded lmdb if not using it.
---

diff --git a/config.mk b/config.mk
index 2ca855901..4d87864bf 100644
--- a/config.mk
+++ b/config.mk
@@ -31,7 +31,9 @@ INSTALL := install
 
 # Flags
 BUILD_LDFLAGS += $(LDFLAGS)
-BUILD_CFLAGS := $(CFLAGS) -std=c99 -D_GNU_SOURCE -Wno-unused -Wtype-limits -Wformat -Wformat-security -Wall -I$(abspath .) -I$(abspath lib/generic) -I$(abspath contrib) -I$(abspath contrib/lmdb)
+BUILD_CFLAGS := $(CFLAGS) -std=c99 -D_GNU_SOURCE
+BUILD_CFLAGS += -Wno-unused -Wtype-limits -Wformat -Wformat-security -Wall
+BUILD_CFLAGS += -I$(abspath .) -I$(abspath lib/generic) -I$(abspath contrib)
 BUILD_CFLAGS += -DPACKAGE_VERSION="\"$(VERSION)\"" -DPREFIX="\"$(PREFIX)\"" -DMODULEDIR="\"$(MODULEDIR)\""
 BUILD_CFLAGS += -fvisibility=hidden
 ifeq (,$(findstring -O,$(CFLAGS)))
diff --git a/contrib/contrib.mk b/contrib/contrib.mk
index 1753b530f..68d475456 100644
--- a/contrib/contrib.mk
+++ b/contrib/contrib.mk
@@ -16,6 +16,7 @@ contrib_SOURCES += contrib/lmdb/mdb.c \
                    contrib/lmdb/midl.c
 contrib_CFLAGS  += -pthread
 contrib_LIBS    += -pthread
+lmdb_CFLAGS     += -I$(abspath contrib/lmdb)
 endif
 
 $(eval $(call make_static,contrib,contrib))