diff options
Diffstat (limited to 'cddl/usr.sbin')
| -rw-r--r-- | cddl/usr.sbin/dtrace/Makefile | 10 | ||||
| -rw-r--r-- | cddl/usr.sbin/lockstat/Makefile | 13 | ||||
| -rw-r--r-- | cddl/usr.sbin/zdb/Makefile | 4 |
3 files changed, 10 insertions, 17 deletions
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index 56e88153bdbc..b8c668bd3dc4 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -1,14 +1,12 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace PROG= dtrace - -BINDIR?= /usr/sbin - SRCS= dtrace.c +BINDIR?= /usr/sbin -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,8 +16,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/compat -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace - # Optional debugging stuff... #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index 4fbddef3fbf1..6cf7009324b7 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -1,14 +1,13 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat PROG= lockstat - -BINDIR?= /usr/sbin - +NO_MAN= SRCS= lockstat.c sym.c +BINDIR?= /usr/sbin -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -19,8 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${OPENSOLARIS_SYS_DISTDIR}/compat \ -I${.CURDIR}/../../../sys -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/lockstat - CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d @@ -28,6 +25,4 @@ CFLAGS+= -DNEED_ERRLOC -g DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt -NO_MAN= - .include <bsd.prog.mk> diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index 35ad2a141d2a..b98038ed819f 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -6,6 +6,9 @@ PROG= zdb MAN= zdb.8 SRCS= zdb.c zdb_il.c +WARNS?= 0 +CSTD= c99 + CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem @@ -23,6 +26,5 @@ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool -CSTD= c99 .include <bsd.prog.mk> |