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/lib/libctf | |
| 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/lib/libctf')
| -rw-r--r-- | cddl/lib/libctf/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile index 6309ee4..5829111 100644 --- a/cddl/lib/libctf/Makefile +++ b/cddl/lib/libctf/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf LIB= ctf -SHLIB_MAJOR= 2 - SRCS= ctf_create.c \ ctf_decl.c \ ctf_error.c \ @@ -17,10 +17,7 @@ SRCS= ctf_create.c \ ctf_types.c \ ctf_util.c -.PATH: ${OPENSOLARIS_USR_DISTDIR}/common/ctf -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/ctf - +WARNS?= 0 CFLAGS+= -DCTF_OLD_VERSIONS CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
