Commit c5b8bc0e authored by Ondřej Surý's avatar Ondřej Surý
Browse files

Merge branch '620-fix-cmocka-includes' into 'master'

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

See merge request !1135
parents bf519a35 a688a43f
Pipeline #7265 failed with stages
in 13 minutes and 48 seconds
......@@ -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 \
......
......@@ -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 =
......
......@@ -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@
......
......@@ -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 =
......
......@@ -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 =
......
......@@ -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@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment