make: CFLAGS cleanup

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

diff --git a/config.mk b/config.mk
index 2ca855901b1f8018316b7b991a6152473ccd107c..4d87864bf9dff7a377ae09d892a8f09f3600b217 100644 (file)
--- 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 1753b530fb1382739aa5c577f737886c71d0e3f8..68d47545602032a7eab4b79f6d8650964e63be2d 100644 (file)
--- 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))