Re-order include directories

${FSTRM_CFLAGS} ${PROTOBUF_C_CFLAGS} ${OPENSSL_CFLAGS} ${LMDB_CFLAGS}
need to appear after all directories in the build tree.

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 8a58f9bf8db1e0f96de18c71190df3723b3051b1..07417e53928b1d8f27baca78e9847b93dc0e894c 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -15,9 +15,8 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
-               ${ISC_INCLUDES} \
-               ${OPENSSL_CFLAGS}
+CINCLUDES =    ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} \
+               ${ISCCFG_INCLUDES} ${ISC_INCLUDES} ${OPENSSL_CFLAGS}
 
 CDEFINES =     -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
 CWARNINGS =

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index cbed0da58d80442d9972ab0f8cea76d8a40bf522..dc763329042d1c107c6b4d5184ff1530db989499 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -49,6 +49,7 @@ CINCLUDES =   -I${srcdir}/include -I${srcdir}/unix/include -I. \
                ${DBDRIVER_INCLUDES} \
                ${LIBUV_CFLAGS} \
                ${FSTRM_CFLAGS} \
+               ${LMDB_CFLAGS} \
                ${OPENSSL_CFLAGS} \
                ${PROTOBUF_C_CFLAGS} \
                ${JSON_C_CFLAGS} \

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 0d683ec61c8555c1d380f9bb10615511a7df2188..fed5323bac2913da87a438d6ecbce79dd2b3f91e 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
                ${BIND9_INCLUDES} \
-               ${OPENSSL_CFLAGS} \
+               ${LMDB_CFLAGS} ${OPENSSL_CFLAGS} \
                ${PROTOBUF_C_CFLAGS} \
                ${MAXMINDDB_CFLAGS} \
                ${LMDB_CFLAGS}

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index da27f5f8f1449299edd7624e62c5103386d19f50..3a0cc39630dde5761ea643ed9e17902a1b532619 100644 (file)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =    -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
                ${ISCCFG_INCLUDES} ${NS_INCLUDES} \
-               ${OPENSSL_CFLAGS}
+               ${FSTRM_CFLAGS} ${OPENSSL_CFLAGS}
 
 CDEFINES =
 CWARNINGS =

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index a56c7d3b0240ae6c658e8512946706d1b8973de3..3bb5e01c09edbc231d227427d6bfa19297fb9e77 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -16,7 +16,8 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
-               ${OPENSSL_CFLAGS} ${MAXMINDDB_CFLAGS} @CMOCKA_CFLAGS@
+               ${FSTRM_CFLAGS} ${OPENSSL_CFLAGS} \
+               ${PROTOBUF_C_CFLAGS} ${MAXMINDDB_CFLAGS} @CMOCKA_CFLAGS@
 CDEFINES =     -DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =      ../../isc/libisc.@A@ @NO_LIBTOOL_ISCLIBS@

diff --git a/make/includes.in b/make/includes.in
index 5373a7e8823227b9de3814341599f43ec554871e..b8317d3d2418f4adcb4b1672c1cecefdd6e7f5d8 100644 (file)
--- a/make/includes.in
+++ b/make/includes.in
@@ -26,9 +26,7 @@ ISCCFG_INCLUDES = @BIND9_ISCCFG_BUILDINCLUDE@ \
        -I${top_srcdir}/lib/isccfg/include
 
 DNS_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \
-       -I${top_srcdir}/lib/dns/include \
-       ${FSTRM_CFLAGS} ${PROTOBUF_C_CFLAGS} \
-       ${OPENSSL_CFLAGS} ${LMDB_CFLAGS}
+       -I${top_srcdir}/lib/dns/include
 
 NS_INCLUDES = @BIND9_NS_BUILDINCLUDE@ \
        -I${top_srcdir}/lib/ns/include