diff options
author | dougb <dougb@FreeBSD.org> | 2005-03-17 08:35:21 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2005-03-17 08:35:21 +0000 |
commit | 78ab7e518f93085fc8fc722d091c18360fe41e38 (patch) | |
tree | d7687a264ef24c4cb5610645cf19af6c94151fb1 | |
parent | 01eced7feeb120c0a0fb59cb04fd4b286bc13d9c (diff) | |
download | FreeBSD-src-78ab7e518f93085fc8fc722d091c18360fe41e38.zip FreeBSD-src-78ab7e518f93085fc8fc722d091c18360fe41e38.tar.gz |
bmake changes to handle the move of dns/sec and related files
-rw-r--r-- | lib/bind/config.mk | 2 | ||||
-rw-r--r-- | lib/bind/dns/Makefile | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/lib/bind/config.mk b/lib/bind/config.mk index 1aecc04..ac8d433 100644 --- a/lib/bind/config.mk +++ b/lib/bind/config.mk @@ -65,7 +65,7 @@ CFLAGS+= -I${LIB_BIND_DIR} LIBBIND9= ${LIB_BIND_REL}/bind9/libbind9.a CFLAGS+= -I${BIND_DIR}/lib/bind9/include LIBDNS= ${LIB_BIND_REL}/dns/libdns.a -CFLAGS+= -I${BIND_DIR}/lib/dns/sec/dst/include \ +CFLAGS+= -I${BIND_DIR}/lib/dns/include/dst \ -I${BIND_DIR}/lib/dns/include \ -I${LIB_BIND_DIR}/dns LIBISCCC= ${LIB_BIND_REL}/isccc/libisccc.a diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile index 731f161..a3ab565 100644 --- a/lib/bind/dns/Makefile +++ b/lib/bind/dns/Makefile @@ -9,23 +9,23 @@ SRCDIR= ${BIND_DIR}/lib/dns LIB= dns -.PATH: ${SRCDIR}/sec/dst -SRCS+= dst_api.c \ - dst_lib.c dst_parse.c \ - dst_result.c gssapi_link.c \ - gssapictx.c hmac_link.c \ - key.c openssl_link.c \ - openssldh_link.c openssldsa_link.c \ - opensslrsa_link.c - .PATH: ${SRCDIR} SRCS+= acl.c adb.c byaddr.c \ cache.c callbacks.c compress.c \ db.c dbiterator.c dbtable.c diff.c dispatch.c \ - dnssec.c ds.c forward.c journal.c keytable.c \ + dnssec.c ds.c \ + dst_api.c dst_lib.c dst_parse.c dst_result.c \ + forward.c \ + gssapi_link.c gssapictx.c hmac_link.c \ + journal.c \ + key.c \ + keytable.c \ lib.c log.c lookup.c \ master.c masterdump.c message.c \ - name.c ncache.c nsec.c order.c peer.c portlist.c \ + name.c ncache.c nsec.c \ + openssl_link.c openssldh_link.c \ + openssldsa_link.c opensslrsa_link.c \ + order.c peer.c portlist.c \ rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c \ rdatalist.c \ rdataset.c rdatasetiter.c rdataslab.c request.c \ @@ -34,7 +34,7 @@ SRCS+= acl.c adb.c byaddr.c \ tsig.c ttl.c validator.c \ version.c view.c xfrin.c zone.c zonekey.c zt.c -CFLAGS+= -I${SRCDIR}/sec/dst/include -I${SRCDIR}/include -I${SRCDIR} +CFLAGS+= -I${SRCDIR}/include/dst -I${SRCDIR}/include -I${SRCDIR} CFLAGS+= -I${.CURDIR} DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD} @@ -115,10 +115,10 @@ DNSINCS= ${SRCDIR}/include/dns/acl.h \ DNSINCSDIR= ${INCLUDEDIR}/dns -DSTINCS= ${SRCDIR}/sec/dst/include/dst/dst.h \ - ${SRCDIR}/sec/dst/include/dst/gssapi.h \ - ${SRCDIR}/sec/dst/include/dst/lib.h \ - ${SRCDIR}/sec/dst/include/dst/result.h \ +DSTINCS= ${SRCDIR}/include/dst/dst.h \ + ${SRCDIR}/include/dst/gssapi.h \ + ${SRCDIR}/include/dst/lib.h \ + ${SRCDIR}/include/dst/result.h DSTINCSDIR= ${INCLUDEDIR}/dst |