[src/trunk]: src/external/cddl/osnet/lib include bsd.init.mnk for consistency...

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

details:   https://anonhg.NetBSD.org/src/rev/35b60e03d434
branches:  trunk
changeset: 816975:35b60e03d434
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 04 17:07:23 2016 +0000

description:
include bsd.init.mnk for consistency and set NOLINT since this overrides
MKLINT which can be re-set from /etc/mk.conf.

diffstat:

 external/cddl/osnet/lib/Makefile.inc       |  6 +++---
 external/cddl/osnet/lib/drti/Makefile      |  3 +--
 external/cddl/osnet/lib/libavl/Makefile    |  4 +++-
 external/cddl/osnet/lib/libctf/Makefile    |  4 ++--
 external/cddl/osnet/lib/libdtrace/Makefile |  6 ++----
 external/cddl/osnet/lib/libnvpair/Makefile |  4 +++-
 external/cddl/osnet/lib/libumem/Makefile   |  4 +++-
 external/cddl/osnet/lib/libuutil/Makefile  |  3 ++-
 external/cddl/osnet/lib/libzfs/Makefile    |  4 +++-
 external/cddl/osnet/lib/libzpool/Makefile  |  4 +++-
 10 files changed, 25 insertions(+), 17 deletions(-)

diffs (120 lines):

diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/Makefile.inc
--- a/external/cddl/osnet/lib/Makefile.inc      Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/Makefile.inc      Thu Aug 04 17:07:23 2016 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile.inc,v 1.4 2016/01/23 21:22:45 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2016/08/04 17:07:23 christos Exp $
 
-MKLINT=no
-MKLINTLIB=no
+NOLINT=
+.include "../Makefile.inc"
 CPPFLAGS+=     -D_KERNTYPES
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/drti/Makefile
--- a/external/cddl/osnet/lib/drti/Makefile     Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/drti/Makefile     Thu Aug 04 17:07:23 2016 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.5 2016/03/11 05:02:32 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/04 17:07:23 christos Exp $
 .include       <bsd.init.mk>
-.include       "../../Makefile.inc"
 
 #.if ${MKPIC} == "yes"
 CFLAGS+=-fPIC
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/libavl/Makefile
--- a/external/cddl/osnet/lib/libavl/Makefile   Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/libavl/Makefile   Thu Aug 04 17:07:23 2016 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.4 2011/01/13 23:18:24 haad Exp $
+#      $NetBSD: Makefile,v 1.5 2016/08/04 17:07:24 christos Exp $
+
+.include <bsd.init.mk>
 
 .PATH: ${.CURDIR}/../../dist/common/avl
 
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/libctf/Makefile
--- a/external/cddl/osnet/lib/libctf/Makefile   Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/libctf/Makefile   Thu Aug 04 17:07:23 2016 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.8 2015/09/24 14:36:54 christos Exp $
+#      $NetBSD: Makefile,v 1.9 2016/08/04 17:07:24 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
-.include       "../../Makefile.inc"
+.include <bsd.init.mk>
 
 LIB=           ctf
 MAN=           ctf.5
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/libdtrace/Makefile
--- a/external/cddl/osnet/lib/libdtrace/Makefile        Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/libdtrace/Makefile        Thu Aug 04 17:07:23 2016 +0000
@@ -1,11 +1,9 @@
-#      $NetBSD: Makefile,v 1.14 2015/10/05 17:49:10 christos Exp $
+#      $NetBSD: Makefile,v 1.15 2016/08/04 17:07:24 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 WARNS=1
-.include <bsd.own.mk>
-
-.include       "../../Makefile.inc"
+.include <bsd.init.mk>
 
 LIB=           dtrace
 
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/libnvpair/Makefile
--- a/external/cddl/osnet/lib/libnvpair/Makefile        Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/libnvpair/Makefile        Thu Aug 04 17:07:23 2016 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.7 2015/04/10 22:44:20 riastradh Exp $
+#      $NetBSD: Makefile,v 1.8 2016/08/04 17:07:24 christos Exp $
+
+.include <bsd.init.mk>
 
 .PATH:  ${.CURDIR}/../../dist/lib/libnvpair
 .PATH:  ${.CURDIR}/../../dist/common/nvpair
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/libumem/Makefile
--- a/external/cddl/osnet/lib/libumem/Makefile  Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/libumem/Makefile  Thu Aug 04 17:07:23 2016 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.5 2010/05/10 06:27:57 haad Exp $
+#      $NetBSD: Makefile,v 1.6 2016/08/04 17:07:24 christos Exp $
+
+.include <bsd.init.mk>
 
 LIB=   umem
 SRCS=  umem.c
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/libuutil/Makefile
--- a/external/cddl/osnet/lib/libuutil/Makefile Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/libuutil/Makefile Thu Aug 04 17:07:23 2016 +0000
@@ -1,5 +1,6 @@
-#      $NetBSD: Makefile,v 1.4 2011/01/13 23:18:24 haad Exp $
+#      $NetBSD: Makefile,v 1.5 2016/08/04 17:07:24 christos Exp $
 
+.include <bsd.init.mk>
 .PATH: ${.CURDIR}/../../dist/lib/libuutil/common
 .PATH: ${.CURDIR}/../../dist/common/avl
 
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/libzfs/Makefile
--- a/external/cddl/osnet/lib/libzfs/Makefile   Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/libzfs/Makefile   Thu Aug 04 17:07:23 2016 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.7 2013/09/11 23:04:10 joerg Exp $
+#      $NetBSD: Makefile,v 1.8 2016/08/04 17:07:24 christos Exp $
+
+.include <bsd.init.mk>
 
 .PATH: ${.CURDIR}/../../dist/common/zfs
 .PATH: ${.CURDIR}/../../dist/common/fs/zfs
diff -r 0d6b91f76972 -r 35b60e03d434 external/cddl/osnet/lib/libzpool/Makefile
--- a/external/cddl/osnet/lib/libzpool/Makefile Thu Aug 04 16:36:45 2016 +0000
+++ b/external/cddl/osnet/lib/libzpool/Makefile Thu Aug 04 17:07:23 2016 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.10 2015/04/10 22:36:50 riastradh Exp $
+#      $NetBSD: Makefile,v 1.11 2016/08/04 17:07:24 christos Exp $
+
+.include <bsd.init.mk>
 
 .include "${.CURDIR}/../../dist/uts/common/Makefile.files"
 .include "../../Makefile.zfs"