[src/trunk]: src libnpf fix: link the library itself to libnv; libnpf users s...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e919acee7ae6
branches:  trunk
changeset: 459124:e919acee7ae6
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sat Aug 24 13:20:52 2019 +0000

description:
libnpf fix: link the library itself to libnv; libnpf users should not be
expected to assume this dependency.

diffstat:

 lib/libnpf/Makefile          |  6 +++++-
 lib/npf/mod.mk               |  4 +---
 libexec/identd/Makefile      |  6 +-----
 usr.sbin/npf/npfctl/Makefile |  5 +----
 usr.sbin/npf/npfd/Makefile   |  5 +----
 5 files changed, 9 insertions(+), 17 deletions(-)

diffs (98 lines):

diff -r a769aa4c9980 -r e919acee7ae6 lib/libnpf/Makefile
--- a/lib/libnpf/Makefile       Sat Aug 24 12:59:34 2019 +0000
+++ b/lib/libnpf/Makefile       Sat Aug 24 13:20:52 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/01/27 04:39:33 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2019/08/24 13:20:52 rmind Exp $
 
 USE_SHLIBDIR=   yes
 
@@ -12,8 +12,12 @@
 INCS=          npf.h
 INCSDIR=       /usr/include
 
+LIBNV!=                cd ${NETBSDSRCDIR}/external/bsd/libnv/lib && ${PRINTOBJDIR}
 CPPFLAGS+=     -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
 
+DPADD+=                ${LIBNV}/libnv.a
+LDADD+=                -L${LIBNV} -lnv
+
 WARNS=         5
 
 .include <bsd.lib.mk>
diff -r a769aa4c9980 -r e919acee7ae6 lib/npf/mod.mk
--- a/lib/npf/mod.mk    Sat Aug 24 12:59:34 2019 +0000
+++ b/lib/npf/mod.mk    Sat Aug 24 13:20:52 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mod.mk,v 1.7 2018/09/29 14:41:36 rmind Exp $
+#      $NetBSD: mod.mk,v 1.8 2019/08/24 13:20:52 rmind Exp $
 
 .include <bsd.own.mk>
 
@@ -25,8 +25,6 @@
 
 LIB=           ${MOD}
 SRCS=          npf${MOD}.c
-
-CPPFLAGS+=     -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
 LIBDPLIBS+=    npf ${NETBSDSRCDIR}/lib/libnpf
 
 .include <bsd.lib.mk>
diff -r a769aa4c9980 -r e919acee7ae6 libexec/identd/Makefile
--- a/libexec/identd/Makefile   Sat Aug 24 12:59:34 2019 +0000
+++ b/libexec/identd/Makefile   Sat Aug 24 13:20:52 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/09/29 14:41:37 rmind Exp $
+# $NetBSD: Makefile,v 1.18 2019/08/24 13:20:52 rmind Exp $
 
 .include <bsd.own.mk>
 
@@ -22,10 +22,6 @@
 .if (${MKNPF} != "no")
 SRCS+= npf.c
 CPPFLAGS+=-DWITH_NPF
-
-PROGDPLIBS+= nv ${NETBSDSRCDIR}/external/bsd/libnv/lib
-CPPFLAGS+= -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
-
 LDADD+=-lnpf
 DPADD+=${LIBNPF}
 .endif
diff -r a769aa4c9980 -r e919acee7ae6 usr.sbin/npf/npfctl/Makefile
--- a/usr.sbin/npf/npfctl/Makefile      Sat Aug 24 12:59:34 2019 +0000
+++ b/usr.sbin/npf/npfctl/Makefile      Sat Aug 24 13:20:52 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/09/29 14:41:36 rmind Exp $
+# $NetBSD: Makefile,v 1.14 2019/08/24 13:20:52 rmind Exp $
 
 .include <bsd.own.mk>
 
@@ -13,9 +13,6 @@
 SRCS+=         npf_scan.l npf_parse.y
 YHEADER=       1
 
-PROGDPLIBS+=   nv ${NETBSDSRCDIR}/external/bsd/libnv/lib
-CPPFLAGS+=     -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
-
 LDADD+=                -lnpf -lpcap -lutil -ly
 DPADD+=                ${LIBNPF} ${LIBUTIL} ${LIBPCAP} ${LIBUTIL} ${LIBY}
 
diff -r a769aa4c9980 -r e919acee7ae6 usr.sbin/npf/npfd/Makefile
--- a/usr.sbin/npf/npfd/Makefile        Sat Aug 24 12:59:34 2019 +0000
+++ b/usr.sbin/npf/npfd/Makefile        Sat Aug 24 13:20:52 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/09/29 14:41:36 rmind Exp $
+# $NetBSD: Makefile,v 1.7 2019/08/24 13:20:52 rmind Exp $
 #
 # Public Domain
 #
@@ -9,9 +9,6 @@
 SRCS=          npfd.c npfd_log.c
 CPPFLAGS+=     -I${.CURDIR}
 
-PROGDPLIBS+=   nv ${NETBSDSRCDIR}/external/bsd/libnv/lib
-CPPFLAGS+=     -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
-
 LDADD+=                -lnpf -lpcap -lutil
 DPADD+=                ${LIBNPF} ${LIBPCAP} ${LIBUTIL}