Move the CMocka include directories from CFLAGS to CINCLUDES where it belongs to...

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index d3ec3f49363d1e8e68fde4b24403b2c16a1b25e0..7b35b935222bc0a9c98c51a3d5a3c7b083e4ac89 100644 (file)
--- 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 bdf5f623311b95783386d2519101f77da51ef0ce..23fae150856ecb600dfe44c40af42626942fc6bc 100644 (file)
--- 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 80bbb70cc9e330b1a296dd12b0dc141e98508d85..5735829728eb4eb82b0c82099ee4078d033447eb 100644 (file)
--- 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 0c0ac6978e139af6b414936d3a84f1f5e6bc9843..09ea9bf505c11dd0b3f21e0297bda5842845717d 100644 (file)
--- 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 9022f94504129c123c4d4189a3f9d398d98b2478..c5036e293d060143fec446639f5735b065169c95 100644 (file)
--- 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 61a66a9124b1f4f15306eecd4976a8d328d9f57f..345f900becb8ac58dd269aa6b959093aa062e38f 100644 (file)
--- 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@