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 | |
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')
-rw-r--r-- | cddl/lib/drti/Makefile | 5 | ||||
-rw-r--r-- | cddl/lib/libavl/Makefile | 1 | ||||
-rw-r--r-- | cddl/lib/libctf/Makefile | 11 | ||||
-rw-r--r-- | cddl/lib/libdtrace/Makefile | 10 | ||||
-rw-r--r-- | cddl/lib/libnvpair/Makefile | 1 | ||||
-rw-r--r-- | cddl/lib/libumem/Makefile | 1 | ||||
-rw-r--r-- | cddl/lib/libuutil/Makefile | 1 | ||||
-rw-r--r-- | cddl/lib/libzfs/Makefile | 1 | ||||
-rw-r--r-- | cddl/lib/libzpool/Makefile | 1 |
9 files changed, 14 insertions, 18 deletions
diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile index 4be57a5..ffd161c 100644 --- a/cddl/lib/drti/Makefile +++ b/cddl/lib/drti/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ -.include "../../Makefile.inc" - -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common SRCS= drti.c FILES= ${SRCS:R:S/$/.o/g} @@ -10,7 +8,6 @@ FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace -WARNS?= 6 CLEANFILES= ${FILES} CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index 8cbaff1..f4db92f 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -4,6 +4,7 @@ LIB= avl SRCS= avl.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common 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 \ diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index 071d950..7e500c7 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -1,12 +1,9 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common LIB= dtrace -SHLIB_MAJOR= 2 - -WARNS= 1 - SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ @@ -51,8 +48,7 @@ DSRCS= errno.d \ signal.d \ unistd.d -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common +WARNS?= 1 CFLAGS+= -I${.OBJDIR} \ -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 7bf5001..da0c7f3 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -10,6 +10,7 @@ SRCS= libnvpair.c \ nvpair_alloc_fixed.c \ nvpair.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index 6b6881e..0ce73f8 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -4,6 +4,7 @@ LIB= umem SRCS= umem.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include <bsd.lib.mk> diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 309ffd0..7521747 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -15,6 +15,7 @@ SRCS= avl.c \ uu_pname.c \ uu_strtoint.c +WARNS?= 0 CFLAGS+= -DNATIVE_BUILD CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 30c516b..3023a1de 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -32,6 +32,7 @@ SRCS+= zfs_deleg.c \ libzfs_sendrecv.c \ libzfs_status.c +WARNS?= 0 CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${.CURDIR}/../../../sbin/mount CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index fec99d9..045e13d 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -33,6 +33,7 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \ ${UNICODE_SRCS} +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem |