From 4ef20db290841afbfce7fe484e2037e084e79238 Mon Sep 17 00:00:00 2001 From: Ulrich Spörlein Date: Tue, 2 Mar 2010 19:04:07 +0000 Subject: 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) --- cddl/lib/libdtrace/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'cddl/lib/libdtrace') diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index 071d9504c0dd..7e500c71e73b 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 \ -- cgit v1.3