From fc861d6ddfef1ad969b1beb206c79466f51bb0fb Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Mon, 16 Apr 2007 21:20:26 +0000
Subject: 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
---
 cddl/lib/libzpool/Makefile | 63 +++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

(limited to 'cddl/lib/libzpool')

diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 38d347e..9bf818c 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -3,42 +3,41 @@
 .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files"
 
 # ZFS_COMMON_SRCS
-.PATH:	${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 # ZFS_SHARED_SRCS
-.PATH:	${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
 # KERNEL_SRCS
-.PATH:	${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
 # LIST_SRCS
-.PATH:	${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os
 # ATOMIC_SRCS
-.PATH:	${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
-
-LIB=	zpool
-SHLIB_MAJOR?=1
-
-ZFS_COMMON_SRCS=	${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c
-ZFS_SHARED_SRCS=	${ZFS_SHARED_OBJS:C/.o$/.c/}
-KERNEL_SRCS=		kernel.c taskq.c util.c
-LIST_SRCS=		list.c
-ATOMIC_SRCS=		atomic.S
-
-SRCS=	${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS}
-
-CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+=-I${.CURDIR}/../../../sys
-
-DPADD=	${LIBTHR} ${LIBZ}
-LDADD=	-lthr -lz
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+
+LIB=		zpool
+
+ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c
+ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/}
+KERNEL_SRCS=	kernel.c taskq.c util.c
+LIST_SRCS=	list.c
+ATOMIC_SRCS=	atomic.S
+
+SRCS=		${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
+		${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS}
+
+CFLAGS+=	-I${.CURDIR}/../../../sys/compat/opensolaris
+CFLAGS+=	-I${.CURDIR}/../../../compat/opensolaris/include
+CFLAGS+=	-I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
+CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+=	-I${.CURDIR}/../../../cddl/lib/libumem
+CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+
+DPADD=		${LIBTHR} ${LIBZ}
+LDADD=		-lthr -lz
 
 # atomic.S doesn't like profiling.
 NO_PROFILE=
-- 
cgit v1.1