diff options
author | uqs <uqs@FreeBSD.org> | 2010-03-02 19:04:07 +0000 |
---|---|---|
committer | uqs <uqs@FreeBSD.org> | 2010-03-02 19:04:07 +0000 |
commit | ce11b17db82815ff8f3d9a6698359d04ebd3615f (patch) | |
tree | 70c9d8907f70b1034bd6e7417000ab87703c1bd2 /cddl/usr.sbin/lockstat | |
parent | 4a10ff6f0485601e757edf83113cfe6362ccf96e (diff) | |
download | FreeBSD-src-ce11b17db82815ff8f3d9a6698359d04ebd3615f.zip FreeBSD-src-ce11b17db82815ff8f3d9a6698359d04ebd3615f.tar.gz |
Remove manual .includes in cddl Makefiles
- Break the dependency on ../Makefile.inc for .PATH, and include
../Makefile.inc implicitly. This is required to ...
- Set WARNS?=6 in top-level Makefile.inc
- Remove now redundant WARNS settings, add WARNS?=0 where appropriate
- Remove redundant SHLIB_MAJOR overrides
- Use NO_MAN, not MK_MAN=no
- Remove redundant inclusion of bsd.own.mk
- Order Makefiles more according to style.Makefile(9)
- Reduce diff of cddl Makefiles against each other
No objection: pjd
Approved by: ed (co-mentor)
Diffstat (limited to 'cddl/usr.sbin/lockstat')
-rw-r--r-- | cddl/usr.sbin/lockstat/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index 4fbddef..6cf7009 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> |