aboutsummaryrefslogtreecommitdiff
path: root/cddl/lib/libdtrace
diff options
context:
space:
mode:
authorUlrich Spörlein <uqs@FreeBSD.org>2010-03-02 19:04:07 +0000
committerUlrich Spörlein <uqs@FreeBSD.org>2010-03-02 19:04:07 +0000
commit4ef20db290841afbfce7fe484e2037e084e79238 (patch)
tree70c9d8907f70b1034bd6e7417000ab87703c1bd2 /cddl/lib/libdtrace
parent7729e3ba4017a3af96cff64b68751cb9d72c79b8 (diff)
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)
Notes
svn path=/head/; revision=204597
Diffstat (limited to 'cddl/lib/libdtrace')
-rw-r--r--cddl/lib/libdtrace/Makefile10
1 files changed, 3 insertions, 7 deletions
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 \