summaryrefslogtreecommitdiffstats
path: root/lib/libunbound
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2014-08-19 06:50:54 +0000
committersjg <sjg@FreeBSD.org>2014-08-19 06:50:54 +0000
commitd7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch)
treeb04f4bd7cd887f50e7d98af35f46b9834ff86c80 /lib/libunbound
parent3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff)
parent4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff)
downloadFreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip
FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz
Merge head from 7/28
Diffstat (limited to 'lib/libunbound')
-rw-r--r--lib/libunbound/Makefile30
-rw-r--r--lib/libunbound/Makefile.depend12
2 files changed, 32 insertions, 10 deletions
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
index eab23e1..c6bbede 100644
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -5,29 +5,39 @@ LDNSDIR= ${.CURDIR}/../../contrib/ldns
UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound
# Hold my beer and watch this
-.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator
+.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/ldns ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator
LIB= unbound
PRIVATELIB=
-CFLAGS= -I${LDNSDIR} -I${UNBOUNDDIR}
+CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
-SRCS= alloc.c autotrust.c config_file.c configlexer.c configparser.c \
+SRCS= alloc.c autotrust.c config_file.c configlexer.l configparser.y \
context.c dname.c dns.c dnstree.c fptr_wlist.c infra.c \
iter_delegpt.c iter_donotq.c iter_fwd.c iter_hints.c iter_priv.c \
- iter_resptype.c iter_scrub.c iter_utils.c iterator.c libunbound.c \
- libworker.c listen_dnsport.c localzone.c locks.c log.c lookup3.c \
- lruhash.c mesh.c mini_event.c modstack.c module.c msgencode.c \
- msgparse.c msgreply.c net_help.c netevent.c outbound_list.c \
- outside_network.c packed_rrset.c random.c rbtree.c regional.c \
- rrset.c rtt.c slabhash.c timehist.c tube.c val_anchor.c \
+ iter_resptype.c iter_scrub.c iter_utils.c iterator.c keyraw.c \
+ libunbound.c libworker.c listen_dnsport.c localzone.c locks.c log.c \
+ lookup3.c lruhash.c mesh.c mini_event.c modstack.c module.c \
+ msgencode.c msgparse.c msgreply.c net_help.c netevent.c \
+ outbound_list.c outside_network.c packed_rrset.c parse.c \
+ parseutil.c random.c rbtree.c regional.c rrdef.c rrset.c rtt.c \
+ sbuffer.c slabhash.c str2wire.c timehist.c tube.c val_anchor.c \
val_kcache.c val_kentry.c val_neg.c val_nsec.c val_nsec3.c \
val_secalgo.c val_sigcrypt.c val_utils.c validator.c \
- winsock_event.c
+ winsock_event.c wire2str.c
WARNS?= 3
DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD}
LDADD+= -lssl -lcrypto -lpthread
+# Misnamed file in upstream source
+configlexer.l: configlexer.lex
+ cp -p ${.ALLSRC} ${.TARGET}
+CLEANFILES+= configlexer.l
+
+# Symbol prefix for lex and yacc
+LFLAGS= -Pub_c_
+YFLAGS= -pub_c_ -d
+
.include <bsd.lib.mk>
diff --git a/lib/libunbound/Makefile.depend b/lib/libunbound/Makefile.depend
index 44c5fdc..2dac9b8 100644
--- a/lib/libunbound/Makefile.depend
+++ b/lib/libunbound/Makefile.depend
@@ -21,4 +21,16 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
+config_file.So: configparser.h
+config_file.o: configparser.h
+config_file.po: configparser.h
+configlexer.So: configlexer.c
+configlexer.So: configparser.h
+configlexer.o: configlexer.c
+configlexer.o: configparser.h
+configlexer.po: configlexer.c
+configlexer.po: configparser.h
+configparser.So: configparser.c
+configparser.o: configparser.c
+configparser.po: configparser.c
.endif
OpenPOWER on IntegriCloud