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/usr.bin/Makefile       |  6 +++---
 cddl/usr.bin/ztest/Makefile | 24 +++++++++++-------------
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'cddl/usr.bin')

diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index b703d19..0a9035a 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -2,12 +2,12 @@
 
 .include <bsd.own.mk>
 
-.if ${MK_ZFS} != "no"
 SUBDIR=	${_ztest}
-.endif
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.if ${MK_ZFS} != "no"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 _ztest=	ztest
 .endif
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 99173d5..b38426c 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -1,23 +1,21 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
 
 PROG=	ztest
+NO_MAN=
 
-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/fs/zfs
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+=-I${.CURDIR}/../../lib/libumem
-CFLAGS+=-I${.CURDIR}/../../../sys
+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/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
 DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL}
 LDADD=	-lavl -lm -lnvpair -lthr -lumem -lzpool
 
-NO_MAN=
-
 .include <bsd.prog.mk>
-- 
cgit v1.1