From dff269b889d62996da86be672e9a5bd5822cdb5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vladimir.cunat@nic.cz>
Date: Tue, 23 Jan 2018 13:51:04 +0100
Subject: [PATCH] make: CFLAGS cleanup
Readability, and don't -I embedded lmdb if not using it.
---
config.mk | 4 +++-
contrib/contrib.mk | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
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))
--
GitLab