[Midnightbsd-cvs] src [10221] trunk/cddl/usr.bin: el sync o
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 2 11:56:44 EDT 2018
Revision: 10221
http://svnweb.midnightbsd.org/src/?rev=10221
Author: laffer1
Date: 2018-06-02 11:56:43 -0400 (Sat, 02 Jun 2018)
Log Message:
-----------
el sync o
Modified Paths:
--------------
trunk/cddl/usr.bin/Makefile
trunk/cddl/usr.bin/Makefile.inc
trunk/cddl/usr.bin/ctfconvert/Makefile
trunk/cddl/usr.bin/ctfconvert/ctfconvert.1
trunk/cddl/usr.bin/ctfdump/Makefile
trunk/cddl/usr.bin/ctfdump/ctfdump.1
trunk/cddl/usr.bin/ctfmerge/Makefile
trunk/cddl/usr.bin/ctfmerge/ctfmerge.1
trunk/cddl/usr.bin/zinject/Makefile
trunk/cddl/usr.bin/zlook/Makefile
trunk/cddl/usr.bin/zstreamdump/Makefile
trunk/cddl/usr.bin/ztest/Makefile
Added Paths:
-----------
trunk/cddl/usr.bin/tests/
trunk/cddl/usr.bin/tests/Makefile
Property Changed:
----------------
trunk/cddl/usr.bin/Makefile.inc
trunk/cddl/usr.bin/ctfconvert/ctfconvert.1
trunk/cddl/usr.bin/ctfdump/ctfdump.1
trunk/cddl/usr.bin/ctfmerge/ctfmerge.1
Modified: trunk/cddl/usr.bin/Makefile
===================================================================
--- trunk/cddl/usr.bin/Makefile 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/Makefile 289813 2015-10-23 08:35:17Z avg $
.include <bsd.own.mk>
@@ -6,12 +7,16 @@
ctfconvert \
ctfdump \
ctfmerge \
- sgsmsg \
+ ${_tests} \
${_zinject} \
${_zlook} \
${_zstreamdump} \
${_ztest}
+.if ${MK_TESTS} != "no"
+_tests= tests
+.endif
+
.if ${MK_ZFS} != "no"
_zinject= zinject
#_zlook= zlook
@@ -21,4 +26,6 @@
.endif
.endif
+SUBDIR_PARALLEL=
+
.include <bsd.subdir.mk>
Modified: trunk/cddl/usr.bin/Makefile.inc
===================================================================
--- trunk/cddl/usr.bin/Makefile.inc 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/Makefile.inc 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,5 +1,5 @@
# $MidnightBSD$
-# $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1 2007/04/06 01:08:58 pjd Exp $
+# $FreeBSD: stable/10/cddl/usr.bin/Makefile.inc 168404 2007-04-06 01:09:06Z pjd $
BINDIR?= /usr/bin
Property changes on: trunk/cddl/usr.bin/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/cddl/usr.bin/ctfconvert/Makefile
===================================================================
--- trunk/cddl/usr.bin/ctfconvert/Makefile 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/ctfconvert/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,7 +1,8 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/ctfconvert/Makefile 321270 2017-07-20 01:01:16Z ngie $
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
DEBUG_FLAGS= -g
@@ -27,8 +28,8 @@
traverse.c \
util.c
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- -I${.CURDIR}/../../../cddl/compat/opensolaris/include \
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
+ -I${SRCTOP}/cddl/compat/opensolaris/include \
-I${OPENSOLARIS_USR_DISTDIR} \
-I${OPENSOLARIS_SYS_DISTDIR} \
-I${OPENSOLARIS_USR_DISTDIR}/head \
Modified: trunk/cddl/usr.bin/ctfconvert/ctfconvert.1
===================================================================
--- trunk/cddl/usr.bin/ctfconvert/ctfconvert.1 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/ctfconvert/ctfconvert.1 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"
.\" Copyright (c) 2010 The FreeBSD Foundation
.\" All rights reserved.
@@ -26,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/cddl/usr.bin/ctfconvert/ctfconvert.1 239969 2012-09-01 06:23:13Z joel $
.\"
.Dd July 7, 2010
.Dt CTFCONVERT 1
@@ -74,7 +75,7 @@
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
-.Xr ctfmerge 1 ,
+.Xr ctfmerge 1 ,
.Xr ctfdump 1
.Sh HISTORY
The
Property changes on: trunk/cddl/usr.bin/ctfconvert/ctfconvert.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/cddl/usr.bin/ctfdump/Makefile
===================================================================
--- trunk/cddl/usr.bin/ctfdump/Makefile 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/ctfdump/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,7 +1,8 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/ctfdump/Makefile 321270 2017-07-20 01:01:16Z ngie $
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump
PROG= ctfdump
SRCS= dump.c \
@@ -12,8 +13,8 @@
-I${OPENSOLARIS_SYS_DISTDIR} \
-I${OPENSOLARIS_USR_DISTDIR}/head \
-I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \
- -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- -I${.CURDIR}/../../../cddl/compat/opensolaris/include \
+ -I${SRCTOP}/sys/cddl/compat/opensolaris \
+ -I${SRCTOP}/cddl/compat/opensolaris/include \
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
Modified: trunk/cddl/usr.bin/ctfdump/ctfdump.1
===================================================================
--- trunk/cddl/usr.bin/ctfdump/ctfdump.1 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/ctfdump/ctfdump.1 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"
.\" Copyright (c) 2010 The FreeBSD Foundation
.\" All rights reserved.
@@ -26,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/cddl/usr.bin/ctfdump/ctfdump.1 211187 2010-08-11 18:00:45Z rpaulo $
.\"
.Dd July 7, 2010
.Dt CTFDUMP 1
Property changes on: trunk/cddl/usr.bin/ctfdump/ctfdump.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/cddl/usr.bin/ctfmerge/Makefile
===================================================================
--- trunk/cddl/usr.bin/ctfmerge/Makefile 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/ctfmerge/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,7 +1,8 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/ctfmerge/Makefile 321270 2017-07-20 01:01:16Z ngie $
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
PROG= ctfmerge
SRCS= alist.c \
@@ -24,8 +25,8 @@
WARNS?= 1
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- -I${.CURDIR}/../../../cddl/compat/opensolaris/include \
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
+ -I${SRCTOP}/cddl/compat/opensolaris/include \
-I${OPENSOLARIS_USR_DISTDIR} \
-I${OPENSOLARIS_SYS_DISTDIR} \
-I${OPENSOLARIS_USR_DISTDIR}/head \
Modified: trunk/cddl/usr.bin/ctfmerge/ctfmerge.1
===================================================================
--- trunk/cddl/usr.bin/ctfmerge/ctfmerge.1 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/ctfmerge/ctfmerge.1 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"
.\" Copyright (c) 2010 The FreeBSD Foundation
.\" All rights reserved.
@@ -26,13 +27,13 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/cddl/usr.bin/ctfmerge/ctfmerge.1 239969 2012-09-01 06:23:13Z joel $
.\"
.Dd July 7, 2010
.Dt CTFMERGE 1
.Os
.Sh NAME
-.Nm ctfmerge
+.Nm ctfmerge
.Nd merge several CTF data sections into one
.Sh SYNOPSIS
.Nm
@@ -109,7 +110,7 @@
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
-.Xr ctfconvert 1 ,
+.Xr ctfconvert 1 ,
.Xr ctfdump 1
.Sh HISTORY
The
Property changes on: trunk/cddl/usr.bin/ctfmerge/ctfmerge.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: trunk/cddl/usr.bin/tests/Makefile
===================================================================
--- trunk/cddl/usr.bin/tests/Makefile (rev 0)
+++ trunk/cddl/usr.bin/tests/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -0,0 +1,9 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/tests/Makefile 313488 2017-02-09 22:49:48Z ngie $
+
+.include <bsd.own.mk>
+
+.PATH: ${SRCTOP}/tests
+KYUAFILE= yes
+
+.include <bsd.test.mk>
Property changes on: trunk/cddl/usr.bin/tests/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/cddl/usr.bin/zinject/Makefile
===================================================================
--- trunk/cddl/usr.bin/zinject/Makefile 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/zinject/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,23 +1,25 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/zinject/Makefile 321270 2017-07-20 01:01:16Z ngie $
-.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zinject
PROG= zinject
SRCS= zinject.c translate.c
-NO_MAN=
+MAN=
WARNS?= 0
-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
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs/
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
Modified: trunk/cddl/usr.bin/zlook/Makefile
===================================================================
--- trunk/cddl/usr.bin/zlook/Makefile 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/zlook/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,25 +1,13 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/zlook/Makefile 321270 2017-07-20 01:01:16Z ngie $
-.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zlook
PROG= zlook
-NO_MAN=
+MAN=
WARNS?= 0
-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}
-#LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
.include <bsd.prog.mk>
Modified: trunk/cddl/usr.bin/zstreamdump/Makefile
===================================================================
--- trunk/cddl/usr.bin/zstreamdump/Makefile 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/zstreamdump/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,22 +1,22 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/zstreamdump/Makefile 321270 2017-07-20 01:01:16Z ngie $
-.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/zstreamdump
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zstreamdump
PROG= zstreamdump
MAN= zstreamdump.1
WARNS?= 0
-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/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-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
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
${LIBPTHREAD} ${LIBZ} ${LIBAVL}
Modified: trunk/cddl/usr.bin/ztest/Makefile
===================================================================
--- trunk/cddl/usr.bin/ztest/Makefile 2018-06-02 15:56:34 UTC (rev 10220)
+++ trunk/cddl/usr.bin/ztest/Makefile 2018-06-02 15:56:43 UTC (rev 10221)
@@ -1,22 +1,23 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/usr.bin/ztest/Makefile 325915 2017-11-16 23:36:19Z avg $
-.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/ztest
PROG= ztest
-NO_MAN=
+MAN=
WARNS?= 0
-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/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-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
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libcmdutils
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
@@ -25,7 +26,8 @@
CSTD= c99
-CFLAGS+= -DDEBUG=1
-#DEBUG_FLAGS+= -g
+# Since there are many asserts in this program, it makes no sense to compile
+# it without debugging.
+CFLAGS+= -g -DDEBUG=1
.include <bsd.prog.mk>
More information about the Midnightbsd-cvs
mailing list