jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 09:02:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Apply a set of style.Makefile(5) changes to src/cddl/ makefiles.

Browse Source 
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
This commit is contained in:
Ruslan Ermilov 2007-04-16 21:20:26 +00:00
parent 2248f68064
commit 5941f0355c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=168792
17 changed files with 167 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cddl/Makefile
View File

@ -1,8 +1,5 @@
# $FreeBSD$
SUBDIR= lib
SUBDIR+=sbin
SUBDIR+=usr.bin
SUBDIR+=usr.sbin
SUBDIR= lib sbin usr.bin usr.sbin
.include <bsd.subdir.mk>

2
cddl/Makefile.inc
View File

@ -1,3 +1,3 @@
# $FreeBSD$
CFLAGS+=-D_SOLARIS_C_SOURCE
CFLAGS+= -D_SOLARIS_C_SOURCE

19
cddl/lib/Makefile
View File

@ -2,17 +2,18 @@
.include <bsd.own.mk>
SUBDIR= libavl
SUBDIR+=libnvpair
SUBDIR+=libumem
SUBDIR+=libuutil
.if ${MK_CDDL} != "no"
SUBDIR+=libzfs
SUBDIR+=${_libzpool}
.endif
SUBDIR= libavl \
libnvpair \
libumem \
libuutil \
${_libzfs} \
${_libzpool}
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
.if ${MK_ZFS} != "no"
_libzfs= libzfs
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
_libzpool= libzpool
.endif
.endif
.include <bsd.subdir.mk>

1
cddl/lib/Makefile.inc
View File

@ -1,5 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib
SHLIB_MAJOR?= 1
.include "../Makefile.inc"

9
cddl/lib/libavl/Makefile
View File

@ -1,13 +1,10 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
LIB= avl
SHLIB_MAJOR?=1
SRCS= avl.c
CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
.include <bsd.lib.mk>

19
cddl/lib/libnvpair/Makefile
View File

@ -1,18 +1,17 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
LIB= nvpair
SHLIB_MAJOR?=1
SRCS= libnvpair.c
SRCS+= nvpair_alloc_system.c
SRCS+= nvpair_alloc_fixed.c
SRCS+= nvpair.c
SRCS= libnvpair.c \
nvpair_alloc_system.c \
nvpair_alloc_fixed.c \
nvpair.c
CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+=-I${.CURDIR}/../../../include
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../include # XXX
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
.include <bsd.lib.mk>

7
cddl/lib/libumem/Makefile
View File

@ -1,12 +1,9 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
LIB= umem
SHLIB_MAJOR?=1
SRCS= umem.c
CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
.include <bsd.lib.mk>

38
cddl/lib/libuutil/Makefile
View File

@ -1,27 +1,25 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
LIB= uutil
SHLIB_MAJOR?=1
SRCS= avl.c \
uu_alloc.c \
uu_avl.c \
uu_dprintf.c \
uu_ident.c \
uu_list.c \
uu_misc.c \
uu_open.c \
uu_pname.c \
uu_strtoint.c
SRCS= avl.c
SRCS+= uu_alloc.c
SRCS+= uu_avl.c
SRCS+= uu_dprintf.c
SRCS+= uu_ident.c
SRCS+= uu_list.c
SRCS+= uu_misc.c
SRCS+= uu_open.c
SRCS+= uu_pname.c
SRCS+= uu_strtoint.c
CFLAGS+=-DNATIVE_BUILD
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head
CFLAGS+= -DNATIVE_BUILD
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
.include <bsd.lib.mk>

73
cddl/lib/libzfs/Makefile
View File

@ -1,49 +1,46 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../../compat/opensolaris/misc
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
.PATH: ${.CURDIR}/../../../compat/opensolaris/misc
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
LIB= zfs
SHLIB_MAJOR?=1
DPADD= ${LIBUTIL}
LDADD= -lutil
SRCS= mnttab.c
SRCS+= mkdirp.c
SRCS+= zmount.c
SRCS+= fsshare.c
SRCS+= zone.c
SRCS= mnttab.c \
mkdirp.c \
zmount.c \
fsshare.c \
zone.c
SRCS+= zfs_namecheck.c
SRCS+= zfs_prop.c
SRCS+= libzfs_dataset.c
SRCS+= libzfs_util.c
SRCS+= libzfs_graph.c
SRCS+= libzfs_mount.c
SRCS+= libzfs_pool.c
SRCS+= libzfs_changelist.c
SRCS+= libzfs_config.c
SRCS+= libzfs_import.c
SRCS+= libzfs_status.c
SRCS+= zfs_namecheck.c \
zfs_prop.c \
libzfs_dataset.c \
libzfs_util.c \
libzfs_graph.c \
libzfs_mount.c \
libzfs_pool.c \
libzfs_changelist.c \
libzfs_config.c \
libzfs_import.c \
libzfs_status.c
CFLAGS+=-DZFS_NO_ACL
CFLAGS+=-I${.CURDIR}/../../../sbin/mount
CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem
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/common/zfs
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
CFLAGS+=-I${.CURDIR}/../../../sys
CFLAGS+= -DZFS_NO_ACL
CFLAGS+= -I${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
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/common/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
.include <bsd.lib.mk>

53
cddl/lib/libzpool/Makefile
View File

@ -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}
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
LIB= zpool
SHLIB_MAJOR?=1
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
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}
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
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
DPADD= ${LIBTHR} ${LIBZ}
LDADD= -lthr -lz
# atomic.S doesn't like profiling.
NO_PROFILE=

7
cddl/sbin/Makefile
View File

@ -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>

30
cddl/sbin/zfs/Makefile
View File

@ -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

32
cddl/sbin/zpool/Makefile
View File

@ -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

6
cddl/usr.bin/Makefile
View File

@ -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>

24
cddl/usr.bin/ztest/Makefile
View File

@ -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>

9
cddl/usr.sbin/Makefile
View File

@ -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>

23
cddl/usr.sbin/zdb/Makefile
View File

@ -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