diff options
| author | ru <ru@FreeBSD.org> | 2007-04-16 21:20:26 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2007-04-16 21:20:26 +0000 |
| commit | fc861d6ddfef1ad969b1beb206c79466f51bb0fb (patch) | |
| tree | 96b513e188e12d0119ea9cb2b351ff665a33a9f9 /cddl/usr.sbin | |
| parent | 84f8e133d5518313892727075c5c44d94f57aa14 (diff) | |
| download | FreeBSD-src-fc861d6ddfef1ad969b1beb206c79466f51bb0fb.zip FreeBSD-src-fc861d6ddfef1ad969b1beb206c79466f51bb0fb.tar.gz | |
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
Diffstat (limited to 'cddl/usr.sbin')
| -rw-r--r-- | cddl/usr.sbin/Makefile | 9 | ||||
| -rw-r--r-- | cddl/usr.sbin/zdb/Makefile | 23 |
2 files changed, 15 insertions, 17 deletions
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile index bfb9171..65756fb 100644 --- a/cddl/usr.sbin/Makefile +++ b/cddl/usr.sbin/Makefile @@ -2,13 +2,12 @@ .include <bsd.own.mk> -SUBDIR= -.if ${MK_ZFS} != "no" -SUBDIR+=${_zdb} -.endif +SUBDIR= ${_zdb} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _zdb= zdb .endif +.endif .include <bsd.subdir.mk> diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index cd624da..fd7cdec 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -1,21 +1,20 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb PROG= zdb MAN= zdb.8 -SRCS+= zdb.c zdb_il.c +SRCS= zdb.c zdb_il.c -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 -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -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 +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +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 |
