Module Name: src
Committed By: martin
Date: Sun Sep 1 13:18:40 UTC 2019
Modified Files:
src/external/bsd/libnv/lib [netbsd-9]: Makefile
src/lib/libnpf [netbsd-9]: Makefile
src/lib/npf [netbsd-9]: mod.mk
src/libexec/identd [netbsd-9]: Makefile
src/usr.sbin/npf/npfctl [netbsd-9]: Makefile
src/usr.sbin/npf/npfd [netbsd-9]: Makefile
Added Files:
src/external/bsd/libnv/lib [netbsd-9]: srcs.mk
Log Message:
Pull up following revision(s) (requested by rmind in ticket #140):
external/bsd/libnv/lib/Makefile: revision 1.3
usr.sbin/npf/npfd/Makefile: revision 1.7
lib/libnpf/Makefile: revision 1.11
lib/libnpf/Makefile: revision 1.12
libexec/identd/Makefile: revision 1.18
usr.sbin/npf/npfctl/Makefile: revision 1.14
lib/npf/mod.mk: revision 1.8
external/bsd/libnv/lib/srcs.mk: revision 1.1
libnpf fix: link the library itself to libnv; libnpf users should not be
expected to assume this dependency.
Move common parts into a makefile fragment usable from elsewhere.
Suggested by mrg.
Include libnv directly into this library
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/libnv/lib/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/external/bsd/libnv/lib/srcs.mk
cvs rdiff -u -r1.10 -r1.10.2.1 src/lib/libnpf/Makefile
cvs rdiff -u -r1.7 -r1.7.2.1 src/lib/npf/mod.mk
cvs rdiff -u -r1.17 -r1.17.2.1 src/libexec/identd/Makefile
cvs rdiff -u -r1.13 -r1.13.2.1 src/usr.sbin/npf/npfctl/Makefile
cvs rdiff -u -r1.6 -r1.6.2.1 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/external/bsd/libnv/lib/Makefile
diff -u src/external/bsd/libnv/lib/Makefile:1.2 src/external/bsd/libnv/lib/Makefile:1.2.4.1
--- src/external/bsd/libnv/lib/Makefile:1.2 Sun Feb 17 23:54:08 2019
+++ src/external/bsd/libnv/lib/Makefile Sun Sep 1 13:18:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/17 23:54:08 bad Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2019/09/01 13:18:39 martin Exp $
WARNS?= 5
@@ -16,6 +16,7 @@ LIB= nv
#INCSDIR= /usr/include
#MAN= nv.3
-SRCS= dnvlist.c msgio.c nvlist.c nvpair.c nv_kern_netbsd.c
+.include "srcs.mk"
+SRCS= ${LIBNV_SRCS}
.include <bsd.lib.mk>
Index: src/lib/libnpf/Makefile
diff -u src/lib/libnpf/Makefile:1.10 src/lib/libnpf/Makefile:1.10.2.1
--- src/lib/libnpf/Makefile:1.10 Sun Jan 27 04:39:33 2019
+++ src/lib/libnpf/Makefile Sun Sep 1 13:18:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/01/27 04:39:33 dholland Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2019/09/01 13:18:39 martin Exp $
USE_SHLIBDIR= yes
@@ -12,7 +12,11 @@ SRCS= npf.c
INCS= npf.h
INCSDIR= /usr/include
-CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+LIBNV_DIST= ${NETBSDSRCDIR}/external/bsd/libnv/lib
+
+.include "${LIBNV_DIST}/srcs.mk"
+SRCS+= ${LIBNV_SRCS}
+CPPFLAGS.npf.c += -I${NVSRC_DISTPATH}
WARNS= 5
Index: src/lib/npf/mod.mk
diff -u src/lib/npf/mod.mk:1.7 src/lib/npf/mod.mk:1.7.2.1
--- src/lib/npf/mod.mk:1.7 Sat Sep 29 14:41:36 2018
+++ src/lib/npf/mod.mk Sun Sep 1 13:18:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.7 2018/09/29 14:41:36 rmind Exp $
+# $NetBSD: mod.mk,v 1.7.2.1 2019/09/01 13:18:40 martin 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.17.2.1
--- src/libexec/identd/Makefile:1.17 Sat Sep 29 14:41:37 2018
+++ src/libexec/identd/Makefile Sun Sep 1 13:18:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/09/29 14:41:37 rmind Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2019/09/01 13:18:39 martin 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.13.2.1
--- src/usr.sbin/npf/npfctl/Makefile:1.13 Sat Sep 29 14:41:36 2018
+++ src/usr.sbin/npf/npfctl/Makefile Sun Sep 1 13:18:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/09/29 14:41:36 rmind Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2019/09/01 13:18:40 martin 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.6.2.1
--- src/usr.sbin/npf/npfd/Makefile:1.6 Sat Sep 29 14:41:36 2018
+++ src/usr.sbin/npf/npfd/Makefile Sun Sep 1 13:18:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/09/29 14:41:36 rmind Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2019/09/01 13:18:39 martin 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}
Added files:
Index: src/external/bsd/libnv/lib/srcs.mk
diff -u /dev/null src/external/bsd/libnv/lib/srcs.mk:1.1.2.2
--- /dev/null Sun Sep 1 13:18:40 2019
+++ src/external/bsd/libnv/lib/srcs.mk Sun Sep 1 13:18:39 2019
@@ -0,0 +1,12 @@
+# $NetBSD: srcs.mk,v 1.1.2.2 2019/09/01 13:18:39 martin Exp $
+
+# Sources and additional flags for libnv
+
+LIBNV_SRCS= dnvlist.c msgio.c nvlist.c nvpair.c nv_kern_netbsd.c
+NVSRC_DISTPATH= ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+.for _s in ${LIBNV_SRCS}
+CPPFLAGS.${_s} += -I${NVSRC_DISTPATH}
+.endfor
+
+.PATH: ${NVSRC_DISTPATH}
