Module Name: src
Committed By: rmind
Date: Sat Aug 24 13:20:52 UTC 2019
Modified Files:
src/lib/libnpf: Makefile
src/lib/npf: mod.mk
src/libexec/identd: Makefile
src/usr.sbin/npf/npfctl: Makefile
src/usr.sbin/npf/npfd: Makefile
Log Message:
libnpf fix: link the library itself to libnv; libnpf users should not be
expected to assume this dependency.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libnpf/Makefile
cvs rdiff -u -r1.7 -r1.8 src/lib/npf/mod.mk
cvs rdiff -u -r1.17 -r1.18 src/libexec/identd/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/npf/npfctl/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/npf/npfd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnpf/Makefile
diff -u src/lib/libnpf/Makefile:1.10 src/lib/libnpf/Makefile:1.11
--- src/lib/libnpf/Makefile:1.10 Sun Jan 27 04:39:33 2019
+++ src/lib/libnpf/Makefile Sat Aug 24 13:20:52 2019
@@ -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 @@ SRCS= npf.c
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>
Index: src/lib/npf/mod.mk
diff -u src/lib/npf/mod.mk:1.7 src/lib/npf/mod.mk:1.8
--- src/lib/npf/mod.mk:1.7 Sat Sep 29 14:41:36 2018
+++ src/lib/npf/mod.mk Sat Aug 24 13:20:52 2019
@@ -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 @@ SHLIBINSTALLDIR=${LIBROOTDIR}/npf
LIB= ${MOD}
SRCS= npf${MOD}.c
-
-CPPFLAGS+= -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
LIBDPLIBS+= npf ${NETBSDSRCDIR}/lib/libnpf
.include <bsd.lib.mk>
Index: src/libexec/identd/Makefile
diff -u src/libexec/identd/Makefile:1.17 src/libexec/identd/Makefile:1.18
--- src/libexec/identd/Makefile:1.17 Sat Sep 29 14:41:37 2018
+++ src/libexec/identd/Makefile Sat Aug 24 13:20:52 2019
@@ -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 @@ CPPFLAGS+=-DWITH_PF
.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
Index: src/usr.sbin/npf/npfctl/Makefile
diff -u src/usr.sbin/npf/npfctl/Makefile:1.13 src/usr.sbin/npf/npfctl/Makefile:1.14
--- src/usr.sbin/npf/npfctl/Makefile:1.13 Sat Sep 29 14:41:36 2018
+++ src/usr.sbin/npf/npfctl/Makefile Sat Aug 24 13:20:52 2019
@@ -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 @@ CPPFLAGS+= -I${.CURDIR}
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}
Index: src/usr.sbin/npf/npfd/Makefile
diff -u src/usr.sbin/npf/npfd/Makefile:1.6 src/usr.sbin/npf/npfd/Makefile:1.7
--- src/usr.sbin/npf/npfd/Makefile:1.6 Sat Sep 29 14:41:36 2018
+++ src/usr.sbin/npf/npfd/Makefile Sat Aug 24 13:20:52 2019
@@ -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 @@ MAN= npfd.8
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}
