diff options
| author | des <des@FreeBSD.org> | 2004-09-22 12:13:58 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-09-22 12:13:58 +0000 |
| commit | 41e930f4803c0d151b08a076f014e9458115444e (patch) | |
| tree | e64094c8992b4e9318db4a40d3a0d5f30c70dced /usr.sbin | |
| parent | f34045dc6a6b7c24616c69b5ba53967c243f0910 (diff) | |
| download | FreeBSD-src-41e930f4803c0d151b08a076f014e9458115444e.zip FreeBSD-src-41e930f4803c0d151b08a076f014e9458115444e.tar.gz | |
Clean up and comment config.mk. Centralize more stuff. Bitch if
POSIX threads libraries are not available. Add crypto support if
the crypto libraries are available. Build dnssec-{keygen,signzone}
if crypto is available.
Submitted by: (in part) dougb@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/Makefile | 7 | ||||
| -rw-r--r-- | usr.sbin/dnssec-keygen/Makefile | 21 | ||||
| -rw-r--r-- | usr.sbin/dnssec-signzone/Makefile | 21 | ||||
| -rw-r--r-- | usr.sbin/named-checkconf/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/named-checkzone/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/named/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/rndc-confgen/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/rndc/Makefile | 4 |
8 files changed, 57 insertions, 12 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 8f14162..bcc25b8 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -195,9 +195,12 @@ _atm= atm #_bsnmpd= bsnmpd .endif +.if !defined(NO_BIND) && !defined(NOCRYPT) +_dnssec-keygen= dnssec-keygen +_dnssec-signzone= dnssec-signzone +.endif + .if !defined(NO_BIND) -#_dnssec-keygen= dnssec-keygen -#_dnssec-signzone= dnssec-signzone _named= named _named.reload= named.reload _named-checkconf= named-checkconf diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile new file mode 100644 index 0000000..0c357df --- /dev/null +++ b/usr.sbin/dnssec-keygen/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +SRCDIR= ${BIND_DIR}/bin/dnssec + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= dnssec-keygen + +.PATH: ${SRCDIR} +SRCS+= dnssec-keygen.c dnssectool.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +MAN= dnssec-keygen.8 + +.include <bsd.prog.mk> diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile new file mode 100644 index 0000000..c8dd6a9 --- /dev/null +++ b/usr.sbin/dnssec-signzone/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +SRCDIR= ${BIND_DIR}/bin/dnssec + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= dnssec-signzone + +.PATH: ${SRCDIR} +SRCS+= dnssec-signzone.c dnssectool.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +MAN= dnssec-signzone.8 + +.include <bsd.prog.mk> diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile index 9579159..a478ba0 100644 --- a/usr.sbin/named-checkconf/Makefile +++ b/usr.sbin/named-checkconf/Makefile @@ -13,8 +13,8 @@ SRCS+= named-checkconf.c check-tool.c CFLAGS+= -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} -LDADD+= ${BIND_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 abde0cc..0531457 100644 --- a/usr.sbin/named-checkzone/Makefile +++ b/usr.sbin/named-checkzone/Makefile @@ -13,8 +13,8 @@ SRCS+= named-checkzone.c check-tool.c CFLAGS+= -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} -LDADD+= ${BIND_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= named-checkzone.8 diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index 9976151..12c7c8f 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -23,8 +23,8 @@ SRCS+= aclconf.c builtin.c client.c config.c control.c \ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} -LDADD+= ${BIND_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 ae91ecf..e69cb46 100644 --- a/usr.sbin/rndc-confgen/Makefile +++ b/usr.sbin/rndc-confgen/Makefile @@ -16,8 +16,8 @@ SRCS+= rndc-confgen.c util.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} -LDADD+= ${BIND_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 b4e801b..0fd49c1 100644 --- a/usr.sbin/rndc/Makefile +++ b/usr.sbin/rndc/Makefile @@ -16,8 +16,8 @@ SRCS+= rndc.c util.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} -DPADD+= ${BIND_DPADD} -LDADD+= ${BIND_LDADD} +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} MAN= rndc.8 rndc.conf.5 |
