Module Name: src
Committed By: christos
Date: Thu Aug 4 17:07:24 UTC 2016
Modified Files:
src/external/cddl/osnet/lib: Makefile.inc
src/external/cddl/osnet/lib/drti: Makefile
src/external/cddl/osnet/lib/libavl: Makefile
src/external/cddl/osnet/lib/libctf: Makefile
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/cddl/osnet/lib/libnvpair: Makefile
src/external/cddl/osnet/lib/libumem: Makefile
src/external/cddl/osnet/lib/libuutil: Makefile
src/external/cddl/osnet/lib/libzfs: Makefile
src/external/cddl/osnet/lib/libzpool: Makefile
Log Message:
include bsd.init.mnk for consistency and set NOLINT since this overrides
MKLINT which can be re-set from /etc/mk.conf.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/drti/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libavl/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/lib/libctf/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libnvpair/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libumem/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libuutil/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libzfs/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/lib/libzpool/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/cddl/osnet/lib/Makefile.inc
diff -u src/external/cddl/osnet/lib/Makefile.inc:1.4 src/external/cddl/osnet/lib/Makefile.inc:1.5
--- src/external/cddl/osnet/lib/Makefile.inc:1.4 Sat Jan 23 16:22:45 2016
+++ src/external/cddl/osnet/lib/Makefile.inc Thu Aug 4 13:07:23 2016
@@ -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
Index: src/external/cddl/osnet/lib/drti/Makefile
diff -u src/external/cddl/osnet/lib/drti/Makefile:1.5 src/external/cddl/osnet/lib/drti/Makefile:1.6
--- src/external/cddl/osnet/lib/drti/Makefile:1.5 Fri Mar 11 00:02:32 2016
+++ src/external/cddl/osnet/lib/drti/Makefile Thu Aug 4 13:07:23 2016
@@ -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
Index: src/external/cddl/osnet/lib/libavl/Makefile
diff -u src/external/cddl/osnet/lib/libavl/Makefile:1.4 src/external/cddl/osnet/lib/libavl/Makefile:1.5
--- src/external/cddl/osnet/lib/libavl/Makefile:1.4 Thu Jan 13 18:18:24 2011
+++ src/external/cddl/osnet/lib/libavl/Makefile Thu Aug 4 13:07:24 2016
@@ -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
Index: src/external/cddl/osnet/lib/libctf/Makefile
diff -u src/external/cddl/osnet/lib/libctf/Makefile:1.8 src/external/cddl/osnet/lib/libctf/Makefile:1.9
--- src/external/cddl/osnet/lib/libctf/Makefile:1.8 Thu Sep 24 10:36:54 2015
+++ src/external/cddl/osnet/lib/libctf/Makefile Thu Aug 4 13:07:24 2016
@@ -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
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.14 src/external/cddl/osnet/lib/libdtrace/Makefile:1.15
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.14 Mon Oct 5 13:49:10 2015
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Thu Aug 4 13:07:24 2016
@@ -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
Index: src/external/cddl/osnet/lib/libnvpair/Makefile
diff -u src/external/cddl/osnet/lib/libnvpair/Makefile:1.7 src/external/cddl/osnet/lib/libnvpair/Makefile:1.8
--- src/external/cddl/osnet/lib/libnvpair/Makefile:1.7 Fri Apr 10 18:44:20 2015
+++ src/external/cddl/osnet/lib/libnvpair/Makefile Thu Aug 4 13:07:24 2016
@@ -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
Index: src/external/cddl/osnet/lib/libumem/Makefile
diff -u src/external/cddl/osnet/lib/libumem/Makefile:1.5 src/external/cddl/osnet/lib/libumem/Makefile:1.6
--- src/external/cddl/osnet/lib/libumem/Makefile:1.5 Mon May 10 02:27:57 2010
+++ src/external/cddl/osnet/lib/libumem/Makefile Thu Aug 4 13:07:24 2016
@@ -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
Index: src/external/cddl/osnet/lib/libuutil/Makefile
diff -u src/external/cddl/osnet/lib/libuutil/Makefile:1.4 src/external/cddl/osnet/lib/libuutil/Makefile:1.5
--- src/external/cddl/osnet/lib/libuutil/Makefile:1.4 Thu Jan 13 18:18:24 2011
+++ src/external/cddl/osnet/lib/libuutil/Makefile Thu Aug 4 13:07:24 2016
@@ -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
Index: src/external/cddl/osnet/lib/libzfs/Makefile
diff -u src/external/cddl/osnet/lib/libzfs/Makefile:1.7 src/external/cddl/osnet/lib/libzfs/Makefile:1.8
--- src/external/cddl/osnet/lib/libzfs/Makefile:1.7 Wed Sep 11 19:04:10 2013
+++ src/external/cddl/osnet/lib/libzfs/Makefile Thu Aug 4 13:07:24 2016
@@ -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
Index: src/external/cddl/osnet/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.10 src/external/cddl/osnet/lib/libzpool/Makefile:1.11
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.10 Fri Apr 10 18:36:50 2015
+++ src/external/cddl/osnet/lib/libzpool/Makefile Thu Aug 4 13:07:24 2016
@@ -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"
