mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Move the CMocka include directories from CFLAGS to CINCLUDES where it belongs to not get overriden later by the default CFLAGS rule

Browse Source
This commit is contained in:
Ondřej Surý
2018-11-26 16:16:28 +01:00
parent bf519a3574
commit a688a43faf
6 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/dns/tests/Makefile.in
View File

@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \ CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
@OPENSSL_INCLUDES@ @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\"" CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\""
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -25,7 +25,6 @@ DNSLIBS = ../libdns.@A@ @DNS_CRYPTO_LIBS@
DNSDEPLIBS = ../libdns.@A@ DNSDEPLIBS = ../libdns.@A@
LIBS = @LIBS@ @CMOCKA_LIBS@ LIBS = @LIBS@ @CMOCKA_LIBS@
CFLAGS = @CFLAGS@ @CMOCKA_CFLAGS@
OBJS = dnstest.@O@ OBJS = dnstest.@O@
SRCS = acl_test.c \ SRCS = acl_test.c \

3
lib/irs/tests/Makefile.in
View File

@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @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/\"" CDEFINES = -DTESTS="\"${top_builddir}/lib/irs/tests/\""
CFGLIBS = ../../isccfg/libisccfg.@A@ CFGLIBS = ../../isccfg/libisccfg.@A@
@@ -27,7 +27,6 @@ ISCDEPLIBS = ../../isc/libisc.@A@
IRSLIBS = ../libirs.@A@ IRSLIBS = ../libirs.@A@
IRSDEPLIBS = ../libirs.@A@ IRSDEPLIBS = ../libirs.@A@
CFLAGS = @CFLAGS@ @CMOCKA_CFLAGS@
LIBS = ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@ LIBS = ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@
OBJS = OBJS =

3
lib/isc/tests/Makefile.in
View File

@@ -15,14 +15,13 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @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/\"" CDEFINES = -DTESTS="\"${top_builddir}/lib/isc/tests/\""
ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@
ISCDEPLIBS = ../libisc.@A@ ISCDEPLIBS = ../libisc.@A@
LIBS = @LIBS@ @CMOCKA_LIBS@ LIBS = @LIBS@ @CMOCKA_LIBS@
CFLAGS = @CFLAGS@ @CMOCKA_CFLAGS@
OBJS = isctest.@O@ OBJS = isctest.@O@

3
lib/isccc/tests/Makefile.in
View File

@@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@
CDEFINES = CDEFINES =
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -27,7 +27,6 @@ ISCDEPLIBS = ../../isc/libisc.@A@
ISCCCLIBS = ../libisccc.@A@ ISCCCLIBS = ../libisccc.@A@
ISCCCDEPLIBS = ../libisccc.@A@ ISCCCDEPLIBS = ../libisccc.@A@
CFLAGS = @CFLAGS@ @CMOCKA_CFLAGS@
LIBS = @LIBS@ @CMOCKA_LIBS@ LIBS = @LIBS@ @CMOCKA_LIBS@
OBJS = OBJS =

3
lib/isccfg/tests/Makefile.in
View File

@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I. -Iinclude \ CINCLUDES = -I. -Iinclude \
${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \ ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
@OPENSSL_INCLUDES@ @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\"" CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\""
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -27,7 +27,6 @@ DNSDEPLIBS = ../../dns/libdns.@A@
ISCCFGLIBS = ../libisccfg.@A@ ISCCFGLIBS = ../libisccfg.@A@
ISCCFGDEPLIBS = ../libisccfg.@A@ ISCCFGDEPLIBS = ../libisccfg.@A@
CFLAGS = @CFLAGS@ @CMOCKA_CFLAGS@
LIBS = @LIBS@ @CMOCKA_LIBS@ LIBS = @LIBS@ @CMOCKA_LIBS@
OBJS = OBJS =

3
lib/ns/tests/Makefile.in
View File

@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@ @BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ CINCLUDES = -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
@OPENSSL_INCLUDES@ @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
CDEFINES = -DTESTS="\"${top_builddir}/lib/ns/tests/\"" CDEFINES = -DTESTS="\"${top_builddir}/lib/ns/tests/\""
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
@@ -26,7 +26,6 @@ DNSDEPLIBS = ../../dns/libdns.@A@
NSLIBS = ../libns.@A@ NSLIBS = ../libns.@A@
NSDEPLIBS = ../libns.@A@ NSDEPLIBS = ../libns.@A@
CFLAGS = @CFLAGS@ @CMOCKA_CFLAGS@
LIBS = @LIBS@ @CMOCKA_LIBS@ LIBS = @LIBS@ @CMOCKA_LIBS@