From 6828e8e3e514fe430f1754fada15a756032399a9 Mon Sep 17 00:00:00 2001 From: dougb Date: Sat, 2 Jun 2007 23:19:58 +0000 Subject: Update bmake glue for the BIND 9.4.1 import. This includes a return to building with threads, since one of the major focuses of the 9.4.x branch is to improve thread performance. --- usr.sbin/dnssec-keygen/Makefile | 4 ++-- usr.sbin/dnssec-signzone/Makefile | 4 ++-- usr.sbin/named-checkconf/Makefile | 4 ++-- usr.sbin/named-checkzone/Makefile | 8 ++++++-- usr.sbin/named/Makefile | 7 ++++--- usr.sbin/rndc-confgen/Makefile | 4 ++-- usr.sbin/rndc/Makefile | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile index 0964188..3ac9005 100644 --- a/usr.sbin/dnssec-keygen/Makefile +++ b/usr.sbin/dnssec-keygen/Makefile @@ -14,8 +14,8 @@ SRCS+= dnssec-keygen.c dnssectool.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} -LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= dnssec-keygen.8 diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile index 73dcc75..7c4ca65 100644 --- a/usr.sbin/dnssec-signzone/Makefile +++ b/usr.sbin/dnssec-signzone/Makefile @@ -14,8 +14,8 @@ SRCS+= dnssec-signzone.c dnssectool.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} -LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= dnssec-signzone.8 diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile index 0a631f9..8728b4a 100644 --- a/usr.sbin/named-checkconf/Makefile +++ b/usr.sbin/named-checkconf/Makefile @@ -14,8 +14,8 @@ SRCS+= named-checkconf.c check-tool.c CFLAGS+= -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} -LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= named-checkconf.8 diff --git a/usr.sbin/named-checkzone/Makefile b/usr.sbin/named-checkzone/Makefile index 1a7d191..169c00a 100644 --- a/usr.sbin/named-checkzone/Makefile +++ b/usr.sbin/named-checkzone/Makefile @@ -14,9 +14,13 @@ SRCS+= named-checkzone.c check-tool.c CFLAGS+= -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} -LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +LINKS= ${BINDIR}/named-checkzone ${BINDIR}/named-compilezone MAN= named-checkzone.8 +MLINKS= named-checkzone.8 named-compilezone.8 + .include diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index 804ef54..6447058 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -13,7 +13,7 @@ PROG= named SRCS+= os.c .PATH: ${SRCDIR} -SRCS+= aclconf.c builtin.c client.c config.c control.c \ +SRCS+= builtin.c client.c config.c control.c \ controlconf.c interfacemgr.c \ listenlist.c log.c logconf.c main.c notify.c \ query.c server.c sortlist.c \ @@ -23,12 +23,13 @@ SRCS+= aclconf.c builtin.c client.c config.c control.c \ lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} +CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include # Remove the date stamp to make it more obvious when real changes happen CFLAGS+= -U__DATE__ -DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} -LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= named.8 lwresd.8 named.conf.5 diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile index e924f5c..b8a52dd 100644 --- a/usr.sbin/rndc-confgen/Makefile +++ b/usr.sbin/rndc-confgen/Makefile @@ -17,8 +17,8 @@ SRCS+= rndc-confgen.c util.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} -LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= rndc-confgen.8 diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile index 70c5d6d..2ca7697 100644 --- a/usr.sbin/rndc/Makefile +++ b/usr.sbin/rndc/Makefile @@ -17,8 +17,8 @@ SRCS+= rndc.c util.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} -LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= rndc.8 rndc.conf.5 -- cgit v1.1