From a688a43fafb23a71700bca9e70dd0b7e9fb532bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Mon, 26 Nov 2018 16:16:28 +0100
Subject: [PATCH] Move the CMocka include directories from CFLAGS to CINCLUDES
 where it belongs to not get overriden later by the default CFLAGS rule

---
 lib/dns/tests/Makefile.in    | 3 +--
 lib/irs/tests/Makefile.in    | 3 +--
 lib/isc/tests/Makefile.in    | 3 +--
 lib/isccc/tests/Makefile.in  | 3 +--
 lib/isccfg/tests/Makefile.in | 3 +--
 lib/ns/tests/Makefile.in     | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index d3ec3f4936..7b35b93522 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		@OPENSSL_INCLUDES@
+		@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
 CDEFINES =	-DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =	../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -25,7 +25,6 @@ DNSLIBS =	../libdns.@A@ @DNS_CRYPTO_LIBS@
 DNSDEPLIBS =	../libdns.@A@
 
 LIBS =		@LIBS@ @CMOCKA_LIBS@
-CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
 
 OBJS =		dnstest.@O@
 SRCS =		acl_test.c \
diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in
index bdf5f62331..23fae15085 100644
--- a/lib/irs/tests/Makefile.in
+++ b/lib/irs/tests/Makefile.in
@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	-I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES}
+CINCLUDES =	-I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} @CMOCKA_CFLAGS@
 CDEFINES =	-DTESTS="\"${top_builddir}/lib/irs/tests/\""
 
 CFGLIBS =	../../isccfg/libisccfg.@A@
@@ -27,7 +27,6 @@ ISCDEPLIBS =	../../isc/libisc.@A@
 IRSLIBS =	../libirs.@A@
 IRSDEPLIBS =	../libirs.@A@
 
-CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
 LIBS =		${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@
 
 OBJS =
diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 80bbb70cc9..5735829728 100644
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -15,14 +15,13 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	-I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@
+CINCLUDES =	-I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
 CDEFINES =	-DTESTS="\"${top_builddir}/lib/isc/tests/\""
 
 ISCLIBS =	../libisc.@A@ @OPENSSL_LIBS@
 ISCDEPLIBS =	../libisc.@A@
 
 LIBS =		@LIBS@ @CMOCKA_LIBS@
-CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
 
 OBJS =		isctest.@O@
 
diff --git a/lib/isccc/tests/Makefile.in b/lib/isccc/tests/Makefile.in
index 0c0ac6978e..09ea9bf505 100644
--- a/lib/isccc/tests/Makefile.in
+++ b/lib/isccc/tests/Makefile.in
@@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	-I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES}
+CINCLUDES =	-I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@
 CDEFINES =
 
 ISCLIBS =	../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -27,7 +27,6 @@ ISCDEPLIBS =	../../isc/libisc.@A@
 ISCCCLIBS =	../libisccc.@A@
 ISCCCDEPLIBS =	../libisccc.@A@
 
-CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
 LIBS =		@LIBS@ @CMOCKA_LIBS@
 
 OBJS =
diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index 9022f94504..c5036e293d 100644
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
 
 CINCLUDES =	-I. -Iinclude \
 		${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-		@OPENSSL_INCLUDES@
+		@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
 CDEFINES =	-DTESTS="\"${top_builddir}/lib/dns/tests/\""
 
 ISCLIBS =	../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -27,7 +27,6 @@ DNSDEPLIBS =	../../dns/libdns.@A@
 ISCCFGLIBS = 	../libisccfg.@A@
 ISCCFGDEPLIBS = ../libisccfg.@A@
 
-CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
 LIBS =		@LIBS@ @CMOCKA_LIBS@
 
 OBJS =
diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index 61a66a9124..345f900bec 100644
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		@OPENSSL_INCLUDES@
+		@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
 CDEFINES =	-DTESTS="\"${top_builddir}/lib/ns/tests/\""
 
 ISCLIBS =	../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -26,7 +26,6 @@ DNSDEPLIBS =	../../dns/libdns.@A@
 NSLIBS =	../libns.@A@
 NSDEPLIBS =	../libns.@A@
 
-CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
 LIBS =		@LIBS@ @CMOCKA_LIBS@