Apply a set of style.Makefile(5) changes to src/cddl/ makefiles.

There are some insignificant non-style changes as well.

Not fixed: makefiles use ${LIBTHR} that doesn't exist, thus
breaking "make checkdpadd" and not tracking dependencies
properly.

Approved by:	pjd

3 files changed, 32 insertions, 37 deletions

diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index 802bbfe..f74307c 100644
--- a/cddl/sbin/Makefile
+++ b/cddl/sbin/Makefile
@@ -2,10 +2,11 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=
+SUBDIR=	${_zfs} ${_zpool}
+
 .if ${MK_ZFS} != "no"
-SUBDIR+=zfs
-SUBDIR+=zpool
+_zfs=	zfs
+_zpool=	zpool
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 7fab5bc..54ddb5b 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -1,25 +1,23 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
 
 PROG=	zfs
 MAN=	zfs.8
-SRCS=	zfs_main.c
-SRCS+=	zfs_iter.c
+SRCS=	zfs_main.c zfs_iter.c
 
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+=-I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
 DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
 LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 7a0f262..24ce7b6 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -1,27 +1,23 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
 
 PROG=	zpool
 MAN=	zpool.8
-SRCS=	zpool_main.c
-SRCS+=	zpool_vdev.c
-SRCS+=	zpool_iter.c
-SRCS+=	zpool_util.c
+SRCS=	zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c
 
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+=-I${.CURDIR}/../../../sys
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
 DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
 LDADD=	-lavl -lgeom -lm -lnvpair -luutil -lzfs