summaryrefslogtreecommitdiffstats
path: root/cddl/sbin
diff options
context:
space:
mode:
authoruqs <uqs@FreeBSD.org>2010-03-02 19:04:07 +0000
committeruqs <uqs@FreeBSD.org>2010-03-02 19:04:07 +0000
commitce11b17db82815ff8f3d9a6698359d04ebd3615f (patch)
tree70c9d8907f70b1034bd6e7417000ab87703c1bd2 /cddl/sbin
parent4a10ff6f0485601e757edf83113cfe6362ccf96e (diff)
downloadFreeBSD-src-ce11b17db82815ff8f3d9a6698359d04ebd3615f.zip
FreeBSD-src-ce11b17db82815ff8f3d9a6698359d04ebd3615f.tar.gz
Remove manual .includes in cddl Makefiles
- Break the dependency on ../Makefile.inc for .PATH, and include ../Makefile.inc implicitly. This is required to ... - Set WARNS?=6 in top-level Makefile.inc - Remove now redundant WARNS settings, add WARNS?=0 where appropriate - Remove redundant SHLIB_MAJOR overrides - Use NO_MAN, not MK_MAN=no - Remove redundant inclusion of bsd.own.mk - Order Makefiles more according to style.Makefile(9) - Reduce diff of cddl Makefiles against each other No objection: pjd Approved by: ed (co-mentor)
Diffstat (limited to 'cddl/sbin')
-rw-r--r--cddl/sbin/zfs/Makefile1
-rw-r--r--cddl/sbin/zpool/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 4a9274e..591ef06 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -6,6 +6,7 @@ PROG= zfs
MAN= zfs.8
SRCS= zfs_main.c zfs_iter.c
+WARNS?= 0
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 4b24dfb..06fd238 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -7,6 +7,7 @@ PROG= zpool
MAN= zpool.8
SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c
+WARNS?= 0
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
OpenPOWER on IntegriCloud