aboutsummaryrefslogtreecommitdiff
path: root/cddl/sbin
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2007-04-16 21:20:26 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2007-04-16 21:20:26 +0000
commit5941f0355c3eaaa03032e0d8511c9a35ba14cd15 (patch)
tree96b513e188e12d0119ea9cb2b351ff665a33a9f9 /cddl/sbin
parent2248f68064bc9f4967841ac1d9672b843e48b8a8 (diff)
downloadsrc-5941f0355c3eaaa03032e0d8511c9a35ba14cd15.tar.gz
src-5941f0355c3eaaa03032e0d8511c9a35ba14cd15.zip
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
Notes
Notes: svn path=/head/; revision=168792
Diffstat (limited to 'cddl/sbin')
-rw-r--r--cddl/sbin/Makefile7
-rw-r--r--cddl/sbin/zfs/Makefile30
-rw-r--r--cddl/sbin/zpool/Makefile32
3 files changed, 32 insertions, 37 deletions
diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index 802bbfe02b22..f74307c5fd6a 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 7fab5bc460d1..54ddb5bc9623 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 7a0f2625a09f..24ce7b68482d 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