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.bin/ctfconvert | |
| 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.bin/ctfconvert')
| -rw-r--r-- | cddl/usr.bin/ctfconvert/Makefile | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile index aea32c7..08be1f0 100644 --- a/cddl/usr.bin/ctfconvert/Makefile +++ b/cddl/usr.bin/ctfconvert/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ -.include <bsd.own.mk> - -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt DEBUG_FLAGS= -g PROG= ctfconvert - +NO_MAN= SRCS= alist.c \ ctf.c \ ctfconvert.c \ @@ -29,8 +28,6 @@ SRCS= alist.c \ traverse.c \ util.c -WARNS?= 6 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ @@ -43,10 +40,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} LDADD= -lctf -ldwarf -lelf -lz -lpthread -.PATH: ${.CURDIR} -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt - -MK_MAN= no - .include <bsd.prog.mk> |
