Sat Jan 28 23:59:15 2017 UTC ()
add sqlite3


(christos)
diff -r1.16 -r1.17 src/external/bsd/dhcp/Makefile.inc
cvs diff -r1.16 -r1.17 src/external/bsd/dhcp/Attic/Makefile.inc (expand / switch to unified diff)

--- src/external/bsd/dhcp/Attic/Makefile.inc 2016/01/10 20:10:44 1.16
+++ src/external/bsd/dhcp/Attic/Makefile.inc 2017/01/28 23:59:15 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.16 2016/01/10 20:10:44 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.17 2017/01/28 23:59:15 christos Exp $
2 2
3WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare 3WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7USE_FORT?= yes # network client/server 7USE_FORT?= yes # network client/server
8CWARNFLAGS.clang+= -Wno-tautological-compare \ 8CWARNFLAGS.clang+= -Wno-tautological-compare \
9 -Wno-conversion -Wno-constant-logical-operand \ 9 -Wno-conversion -Wno-constant-logical-operand \
10 -Wno-format-security -Wno-error=unused-const-variable 10 -Wno-format-security -Wno-error=unused-const-variable
11 11
12DIST:= ${.PARSEDIR}/dist 12DIST:= ${.PARSEDIR}/dist
13BIND:= ${.PARSEDIR}/../bind/dist 13BIND:= ${.PARSEDIR}/../bind/dist
14.PATH: ${DIST}/${DHCPSRCDIR} 14.PATH: ${DIST}/${DHCPSRCDIR}
@@ -28,29 +28,29 @@ CPPFLAGS+= -I${BIND}/lib/${dir}/unix/inc @@ -28,29 +28,29 @@ CPPFLAGS+= -I${BIND}/lib/${dir}/unix/inc
28CPPFLAGS+= -I${BIND}/lib/${dir}/pthreads/include 28CPPFLAGS+= -I${BIND}/lib/${dir}/pthreads/include
29.endfor 29.endfor
30CPPFLAGS+= -DLOCALSTATEDIR='"/var"' 30CPPFLAGS+= -DLOCALSTATEDIR='"/var"'
31LDADD+= ${COBJDIR}/libdhcp.a 31LDADD+= ${COBJDIR}/libdhcp.a
32LDADD+= ${OMOBJDIR}/libomapi.a 32LDADD+= ${OMOBJDIR}/libomapi.a
33.if defined(PROG) && ${PROG} == "dhclient" 33.if defined(PROG) && ${PROG} == "dhclient"
34LDADD+=-Wl,-Bstatic 34LDADD+=-Wl,-Bstatic
35.endif 35.endif
36LDADD+= -lirs -lisccfg -ldns -lisc 36LDADD+= -lirs -lisccfg -ldns -lisc
37LDADD+=-lpthread 37LDADD+=-lpthread
38.if (${MKCRYPTO} != "no") 38.if (${MKCRYPTO} != "no")
39.if (${MKKERBEROS} != "no") 39.if (${MKKERBEROS} != "no")
40LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \ 40LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
41 -lcom_err -lroken -lasn1 -lwind 41 -lcom_err -lroken -lasn1 -lwind -lsqlite3
42DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \ 42DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
43 ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND} 43 ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND} ${LIBSQLITE3}
44.endif 44.endif
45.if defined(PROG) && ${PROG} == "dhclient" 45.if defined(PROG) && ${PROG} == "dhclient"
46LDADD+=-Wl,-Bdynamic 46LDADD+=-Wl,-Bdynamic
47.endif 47.endif
48LDADD+= -lcrypto -lipsec -lcrypt 48LDADD+= -lcrypto -lipsec -lcrypt
49DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT} 49DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
50.endif 50.endif
51.if defined(PROG) && ${PROG} == "dhclient" 51.if defined(PROG) && ${PROG} == "dhclient"
52LDADD+=-Wl,-Bdynamic 52LDADD+=-Wl,-Bdynamic
53.endif 53.endif
54DPADD+= ${COBJDIR}/libdhcp.a 54DPADD+= ${COBJDIR}/libdhcp.a
55DPADD+= ${OMOBJDIR}/libomapi.a 55DPADD+= ${OMOBJDIR}/libomapi.a
56DPADD+= ${LIBDNS} ${LIBISC} 56DPADD+= ${LIBDNS} ${LIBISC}