From owner-svn-src-all@FreeBSD.ORG Tue Mar 2 19:04:07 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86F65106566B; Tue, 2 Mar 2010 19:04:07 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 727B58FC18; Tue, 2 Mar 2010 19:04:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o22J47qw015975; Tue, 2 Mar 2010 19:04:07 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o22J47dv015953; Tue, 2 Mar 2010 19:04:07 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201003021904.o22J47dv015953@svn.freebsd.org> From: Ulrich Spoerlein Date: Tue, 2 Mar 2010 19:04:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204597 - in head/cddl: . lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconvert usr.bin/ctfd... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 19:04:07 -0000 Author: uqs Date: Tue Mar 2 19:04:07 2010 New Revision: 204597 URL: http://svn.freebsd.org/changeset/base/204597 Log: 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) Modified: head/cddl/Makefile.inc head/cddl/lib/drti/Makefile head/cddl/lib/libavl/Makefile head/cddl/lib/libctf/Makefile head/cddl/lib/libdtrace/Makefile head/cddl/lib/libnvpair/Makefile head/cddl/lib/libumem/Makefile head/cddl/lib/libuutil/Makefile head/cddl/lib/libzfs/Makefile head/cddl/lib/libzpool/Makefile head/cddl/sbin/zfs/Makefile head/cddl/sbin/zpool/Makefile head/cddl/usr.bin/ctfconvert/Makefile head/cddl/usr.bin/ctfdump/Makefile head/cddl/usr.bin/ctfmerge/Makefile head/cddl/usr.bin/sgsmsg/Makefile head/cddl/usr.bin/zinject/Makefile head/cddl/usr.bin/ztest/Makefile head/cddl/usr.sbin/dtrace/Makefile head/cddl/usr.sbin/lockstat/Makefile head/cddl/usr.sbin/zdb/Makefile Modified: head/cddl/Makefile.inc ============================================================================== --- head/cddl/Makefile.inc Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/Makefile.inc Tue Mar 2 19:04:07 2010 (r204597) @@ -7,4 +7,5 @@ IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN +WARNS?= 6 CSTD?= gnu89 Modified: head/cddl/lib/drti/Makefile ============================================================================== --- head/cddl/lib/drti/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/drti/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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 \ Modified: head/cddl/lib/libavl/Makefile ============================================================================== --- head/cddl/lib/libavl/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/libavl/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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 Modified: head/cddl/lib/libctf/Makefile ============================================================================== --- head/cddl/lib/libctf/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/libctf/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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 \ Modified: head/cddl/lib/libdtrace/Makefile ============================================================================== --- head/cddl/lib/libdtrace/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/libdtrace/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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 \ Modified: head/cddl/lib/libnvpair/Makefile ============================================================================== --- head/cddl/lib/libnvpair/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/libnvpair/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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 Modified: head/cddl/lib/libumem/Makefile ============================================================================== --- head/cddl/lib/libumem/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/libumem/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -4,6 +4,7 @@ LIB= umem SRCS= umem.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include Modified: head/cddl/lib/libuutil/Makefile ============================================================================== --- head/cddl/lib/libuutil/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/libuutil/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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 Modified: head/cddl/lib/libzfs/Makefile ============================================================================== --- head/cddl/lib/libzfs/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/libzfs/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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 Modified: head/cddl/lib/libzpool/Makefile ============================================================================== --- head/cddl/lib/libzpool/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/lib/libzpool/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -33,6 +33,7 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_S ${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 Modified: head/cddl/sbin/zfs/Makefile ============================================================================== --- head/cddl/sbin/zfs/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/sbin/zfs/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -6,6 +6,7 @@ PROG= zfs MAN= zfs.8 SRCS= zfs_main.c zfs_iter.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: head/cddl/sbin/zpool/Makefile ============================================================================== --- head/cddl/sbin/zpool/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/sbin/zpool/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -7,6 +7,7 @@ PROG= zpool MAN= zpool.8 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: head/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- head/cddl/usr.bin/ctfconvert/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.bin/ctfconvert/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -1,13 +1,12 @@ # $FreeBSD$ -.include - -.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/ 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 Modified: head/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- head/cddl/usr.bin/ctfdump/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.bin/ctfdump/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -1,15 +1,14 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump PROG= ctfdump - +NO_MAN= SRCS= dump.c \ symbol.c \ utils.c -WARNS?= 6 - CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ @@ -22,9 +21,4 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ} LDADD= -lpthread -lelf -lz -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump - -NO_MAN= - .include Modified: head/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- head/cddl/usr.bin/ctfmerge/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.bin/ctfmerge/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -1,13 +1,10 @@ # $FreeBSD$ -.include - -.include "../../Makefile.inc" - -WARNS= 1 +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt PROG= ctfmerge - +NO_MAN= SRCS= alist.c \ barrier.c \ ctf.c \ @@ -26,7 +23,7 @@ SRCS= alist.c \ traverse.c \ util.c -WARNS?= 6 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -40,9 +37,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} LDADD= -lctf -ldwarf -lelf -lz -lpthread -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt - -MK_MAN= no - .include Modified: head/cddl/usr.bin/sgsmsg/Makefile ============================================================================== --- head/cddl/usr.bin/sgsmsg/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.bin/sgsmsg/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -1,20 +1,17 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl # This program is required as a bootstrap tool for 'make buildworld' PROG= sgsmsg - +NO_MAN= SRCS= avl.c sgsmsg.c string_table.c findprime.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/avl - -NO_MAN= - .include Modified: head/cddl/usr.bin/zinject/Makefile ============================================================================== --- head/cddl/usr.bin/zinject/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.bin/zinject/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -6,6 +6,7 @@ PROG= zinject SRCS= zinject.c translate.c NO_MAN= +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem Modified: head/cddl/usr.bin/ztest/Makefile ============================================================================== --- head/cddl/usr.bin/ztest/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.bin/ztest/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -5,6 +5,7 @@ PROG= ztest NO_MAN= +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem Modified: head/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- head/cddl/usr.sbin/dtrace/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.sbin/dtrace/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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/ -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 Modified: head/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- head/cddl/usr.sbin/lockstat/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.sbin/lockstat/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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/ -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 Modified: head/cddl/usr.sbin/zdb/Makefile ============================================================================== --- head/cddl/usr.sbin/zdb/Makefile Tue Mar 2 18:44:08 2010 (r204596) +++ head/cddl/usr.sbin/zdb/Makefile Tue Mar 2 19:04:07 2010 (r204597) @@ -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} ${LI ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool -CSTD= c99 .include