Compare commits

...

1 Commits

Author SHA1 Message Date
Mark Andrews
6c536630ee define JSON_C_CFLAGS and JSON_C_LIBS in rules/make.in and use them in Makefile.in 2019-06-25 12:02:22 +10:00
35 changed files with 88 additions and 67 deletions

View File

@@ -15,8 +15,9 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
CINCLUDES = ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} \
${ISCCFG_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES = -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
CWARNINGS =
@@ -34,8 +35,8 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
NSDEPENDLIBS = ../../lib/ns/libns.@A@
LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${ISCNOSYMLIBS} ${JSON_C_LIBS} @LIBS@
SUBDIRS =

View File

@@ -20,7 +20,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} @JSON_C_CFLAGS@
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} ${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =
@@ -41,9 +41,9 @@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
RNDCLIBS = ${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${DNSLIBS} ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} ${JSON_C_LIBS} @LIBS@
CONFDEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}

View File

@@ -16,7 +16,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} \
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES = -DVERSION=\"${VERSION}\" \
-DSYSCONFDIR=\"${sysconfdir}\"
@@ -35,8 +36,10 @@ IRSDEPLIBS = ../../lib/irs/libirs.@A@
DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} \
${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} \
${JSON_C_LIBS} @LIBS@
SUBDIRS =

View File

@@ -19,7 +19,8 @@ READLINE_LIB = @READLINE_LIB@
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} \
${BIND9_INCLUDES} ${ISC_INCLUDES} \
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ \
@OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES = -DVERSION=\"${VERSION}\"
CWARNINGS =
@@ -41,10 +42,10 @@ DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \
${ISCDEPLIBS} ${ISCCFGDEPLIBS}
LIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
${ISCLIBS} @LIBIDN2_LIBS@ @JSON_C_LIBS@ @LIBS@
${ISCLIBS} @LIBIDN2_LIBS@ ${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @JSON_C_LIBS@ @LIBS@
${ISCNOSYMLIBS} @LIBIDN2_LIBS@ ${JSON_C_LIBS} @LIBS@
SUBDIRS =

View File

@@ -15,7 +15,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES = -DVERSION=\"${VERSION}\"
CWARNINGS =
@@ -29,9 +30,9 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${DNSLIBS} ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} ${JSON_C_LIBS} @LIBS@
# Alphabetically
TARGETS = dnssec-cds@EXEEXT@ dnssec-dsfromkey@EXEEXT@ \

View File

@@ -46,7 +46,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${NS_INCLUDES} ${DNS_INCLUDES} \
${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \
${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
${DBDRIVER_INCLUDES} @OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES = @CONTRIB_DLZ@
@@ -73,12 +73,12 @@ DEPLIBS = ${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
LIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
@JSON_C_LIBS@ @LIBS@
${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
@JSON_C_LIBS@ @LIBS@
${JSON_C_LIBS} @LIBS@
SUBDIRS = unix

View File

@@ -15,7 +15,8 @@ top_srcdir = @top_srcdir@
CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =

View File

@@ -21,7 +21,7 @@ DST_GSSAPI_INC = @DST_GSSAPI_INC@
CINCLUDES = ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISC_INCLUDES} \
${ISCCFG_INCLUDES} ${IRS_INCLUDES} ${DST_GSSAPI_INC} \
@OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
@OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES = -DVERSION=\"${VERSION}\" @USE_GSSAPI@
CWARNINGS =
@@ -43,10 +43,10 @@ DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \
${ISCDEPLIBS} ${ISCCFGDEPLIBS}
LIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
${ISCCFGLIBS} ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
${ISCCFGLIBS} ${ISCNOSYMLIBS} ${JSON_C_LIBS} @LIBS@
SUBDIRS =

View File

@@ -13,7 +13,7 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${ISC_INCLUDES} @JSON_C_CFLAGS@
CINCLUDES = ${ISC_INCLUDES} ${JSON_C_CFLAGS}
CDEFINES =
@@ -24,7 +24,7 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
DEPLIBS = ${ISCDEPLIBS}
# if FORCE_STATIC_PROVIDER: LIBS += ${PROVIDER}
LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
SUBDIRS = benchmarks

View File

@@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${NS_INCLUDES} ${DNS_INCLUDES} \
${ISCCFG_INCLUDES} ${ISC_INCLUDES} @JSON_C_CFLAGS@
${ISCCFG_INCLUDES} ${ISC_INCLUDES} ${JSON_C_CFLAGS}
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@

View File

@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} @JSON_C_CFLAGS@
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} ${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =
@@ -34,8 +34,8 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
DNSDEPLIBS = ../../lib/dns/libdns.@A@
BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${ISCNOSYMLIBS} ${JSON_C_LIBS} @LIBS@
RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}

View File

@@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
@OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
@OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =
@@ -30,7 +30,7 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
ISCDEPNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
LIBS = @JSON_C_LIBS@ @LIBS@
LIBS = ${JSON_C_LIBS} @LIBS@
SUBDIRS = system @PKCS11_TOOLS@
TESTDIRS = system

View File

@@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ ${JSON_C_CFLAGS}
CDEFINES = @USE_GSSAPI@
@@ -32,7 +32,7 @@ ISCDEPLIBS = ../../../lib/isc/libisc.@A@
ISCDEPNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@
ISCCFGDEPLIBS = ../../../lib/isccfg/libisccfg.@A@
LIBS = @JSON_C_LIBS@ @LIBS@
LIBS = ${JSON_C_LIBS} @LIBS@
SUBDIRS =

View File

@@ -13,7 +13,8 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =

View File

@@ -15,7 +15,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =
@@ -28,7 +29,7 @@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${DNSLIBS} ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
TARGETS = pipequeries@EXEEXT@

View File

@@ -15,7 +15,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =
@@ -28,7 +29,7 @@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${DNSLIBS} ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
TARGETS = bigkey@EXEEXT@

View File

@@ -15,7 +15,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =
@@ -28,7 +29,7 @@ ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${DNSLIBS} ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
TARGETS = keycreate@EXEEXT@ keydelete@EXEEXT@

View File

@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
${BIND9_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
${BIND9_INCLUDES} @OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES = -DVERSION=\"${VERSION}\"
CWARNINGS =
@@ -32,8 +32,8 @@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
LIBS = ${ISCLIBS} ${JSON_C_LIBS} @LIBS@
NOSYMLIBS = ${ISCNOSYMLIBS} ${JSON_C_LIBS} @LIBS@
SUBDIRS =

View File

@@ -6,7 +6,7 @@ abs_srcdir = @abs_srcdir@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -I.. ${DNS_INCLUDES} ${ISC_INCLUDES} \
@OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
@OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES = -DFUZZDIR=\"$(abs_srcdir)\"
ISCLIBS = ../lib/isc/libisc.@A@ @OPENSSL_LIBS@
@@ -14,7 +14,7 @@ ISCDEPLIBS = ../lib/isc/libisc.@A@
DNSLIBS = ../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
DNSDEPLIBS = ../lib/dns/libdns.@A@
LIBS = @JSON_C_LIBS@ @LIBS@
LIBS = ${JSON_C_LIBS} @LIBS@
OBJS = main.@O@
SRCS = main.c dns_name_fromtext_target.c dns_rdata_fromwire_text.c

View File

@@ -18,7 +18,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =

View File

@@ -27,7 +27,8 @@ VERSION=@BIND9_VERSION@
USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
CINCLUDES = -I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ \
${JSON_C_CFLAGS}
CDEFINES = @USE_GSSAPI@ ${USE_ISC_SPNEGO}

View File

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

View File

@@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I. -I./include -I${srcdir}/include \
${DNS_INCLUDES} ${ISC_INCLUDES} \
${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =

View File

@@ -15,7 +15,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} \
@CMOCKA_CFLAGS@ ${JSON_C_CFLAGS}
CDEFINES = -DTESTS="\"${top_builddir}/lib/irs/tests/\""
CFGLIBS = ../../isccfg/libisccfg.@A@
@@ -27,7 +28,8 @@ ISCDEPLIBS = ../../isc/libisc.@A@
IRSLIBS = ../libirs.@A@
IRSDEPLIBS = ../libirs.@A@
LIBS = ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
LIBS = ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ \
@CMOCKA_LIBS@ ${JSON_C_LIBS}
OBJS =
SRCS = resconf_test.c

View File

@@ -20,7 +20,8 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I${srcdir}/unix/include \
-I${srcdir}/pthreads/include \
-I./include \
-I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
-I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@ \
${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =
@@ -76,7 +77,7 @@ SRCS = pk11.c pk11_result.c \
symtab.c task.c taskpool.c timer.c \
tm.c version.c
LIBS = @OPENSSL_LIBS@ @JSON_C_LIBS@ @LIBS@
LIBS = @OPENSSL_LIBS@ ${JSON_C_LIBS} @LIBS@
# Note: the order of SUBDIRS is important.
# Attempt to disable parallel processing.

View File

@@ -15,13 +15,13 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ ${JSON_C_CFLAGS}
CDEFINES = -DTESTS="\"${top_builddir}/lib/isc/tests/\""
ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@
ISCDEPLIBS = ../libisc.@A@
LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
LIBS = @LIBS@ @CMOCKA_LIBS@ ${JSON_C_LIBS}
OBJS = isctest.@O@

View File

@@ -15,7 +15,7 @@ CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../pthreads/include \
-I../include \
-I${srcdir}/../include \
-I${srcdir}/.. @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
-I${srcdir}/.. @OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =

View File

@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} \
${ISCCC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
${ISCCC_INCLUDES} @OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =

View File

@@ -19,7 +19,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
@CMOCKA_CFLAGS@ ${JSON_C_CFLAGS}
CDEFINES =
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@

View File

@@ -17,7 +17,8 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} @JSON_C_CFLAGS@
CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
${JSON_C_CFLAGS}
CDEFINES =
CWARNINGS =

View File

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

View File

@@ -26,7 +26,7 @@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
CINCLUDES = -I. -I${top_srcdir}/lib/ns -Iinclude \
${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ ${JSON_C_CFLAGS}
CDEFINES = -DNAMED_PLUGINDIR=\"${plugindir}\"

View File

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

View File

@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I${srcdir}/include -I../dns/include \
${DNS_INCLUDES} ${ISC_INCLUDES} \
-I${top_srcdir}/lib/irs/include \
-I../../lib/irs/include @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
-I../../lib/irs/include @OPENSSL_INCLUDES@ ${JSON_C_CFLAGS}
CDEFINES = -DVERSION=\"${VERSION}\" \
-DSYSCONFDIR=\"${sysconfdir}\"
@@ -36,7 +36,7 @@ IRSDEPLIBS = ../irs/libirs.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ @JSON_C_LIBS@
LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ ${JSON_C_LIBS}
SUBDIRS =

View File

@@ -116,6 +116,9 @@ BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
BUILD_LDFLAGS = @BUILD_LDFLAGS@
BUILD_LIBS = @BUILD_LIBS@
JSON_C_CFLAGS = @JSON_C_CFLAGS@
JSON_C_LIBS = @JSON_C_LIBS@
LFS_CFLAGS = @LFS_CFLAGS@
LFS_LDFLAGS = @LFS_LDFLAGS@
LFS_LIBS = @LFS_LIBS@