diff options
Diffstat (limited to 'cddl/usr.bin')
-rw-r--r-- | cddl/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | cddl/usr.bin/zinject/Makefile | 25 | ||||
-rw-r--r-- | cddl/usr.bin/ztest/Makefile | 12 |
3 files changed, 34 insertions, 5 deletions
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile index 4112e8a..c6b1341 100644 --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -7,9 +7,11 @@ SUBDIR= \ ctfdump \ ctfmerge \ sgsmsg \ + ${_zinject} \ ${_ztest} .if ${MK_ZFS} != "no" +_zinject= zinject .if ${MK_LIBTHR} != "no" _ztest= ztest .endif diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile new file mode 100644 index 0000000..c8693fe --- /dev/null +++ b/cddl/usr.bin/zinject/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject + +PROG= zinject +SRCS= zinject.c translate.c +NO_MAN= + +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../lib/libumem + +DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ + ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL} +LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool + +.include <bsd.prog.mk> diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index 0bdded6..cc0bca4 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -1,18 +1,20 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest +.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest PROG= ztest NO_MAN= +CFLAGS+= -std=c99 + CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +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/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |