[src/trunk]: src/usr.bin/kdump Add dtrace ioctls

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc59aefcdb77
branches:  trunk
changeset: 340720:cc59aefcdb77
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Sep 26 03:31:11 2015 +0000

description:
Add dtrace ioctls

diffstat:

 usr.bin/kdump/Makefile         |   5 +++--
 usr.bin/kdump/Makefile.ioctl-c |  11 +++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r ac8d2f94fa57 -r cc59aefcdb77 usr.bin/kdump/Makefile
--- a/usr.bin/kdump/Makefile    Sat Sep 26 01:46:14 2015 +0000
+++ b/usr.bin/kdump/Makefile    Sat Sep 26 03:31:11 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2011/09/21 17:48:51 christos Exp $
+#      $NetBSD: Makefile,v 1.31 2015/09/26 03:31:11 christos Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
 .include <bsd.own.mk>          # for MKDYNAMICROOT & NETBSDSRCDIR
@@ -6,7 +6,6 @@
 USE_FORT?= yes # cryptographic software
 
 PROG=  kdump
-CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys
 SRCS=  kdump.c subr.c setemul.c siginfo.c
 .PATH: ${NETBSDSRCDIR}/usr.bin/ktrace
 CLEANFILES+=siginfo.c
@@ -18,6 +17,8 @@
 .include "Makefile.ioctl-c"
 .include "Makefile.siginfo-c"
 
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys
+
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
diff -r ac8d2f94fa57 -r cc59aefcdb77 usr.bin/kdump/Makefile.ioctl-c
--- a/usr.bin/kdump/Makefile.ioctl-c    Sat Sep 26 01:46:14 2015 +0000
+++ b/usr.bin/kdump/Makefile.ioctl-c    Sat Sep 26 03:31:11 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ioctl-c,v 1.28 2015/02/07 14:37:42 christos Exp $
+#      $NetBSD: Makefile.ioctl-c,v 1.29 2015/09/26 03:31:11 christos Exp $
 
 # NOTE: <bsd.own.mk> needs to be previously .included for NETBSDSRCDIR
 
@@ -20,10 +20,13 @@
 .endif
 .endfor
 .endfor
+.if ${MKDTRACE} != 'no"
+EXTRAS=        ${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common/sys/dtrace.h
+.endif
 
 .if !make(cleandir) && !make(obj) && !make(includes) && !make(install)
 DEPFILEGLOB = ${TOOL_SED} -ne '/\/usr\/.*include\/.*\.h[       ]/{s/[  ]obsolete$$//;t' -e 's/xenio//;t' -e 's,\.\([^  ]*\).*,${DESTDIR}\1,;p;}' ${SETFILES}
-DEPFILES != ${DEPFILEGLOB} | xargs egrep -l '(_IO\(|_IOR\(|_IOW\(|_IOWR\()' 2>/dev/null || :
+DEPFILES != (${DEPFILEGLOB}; echo ${EXTRAS}) | xargs egrep -l '(_IO\(|_IOR\(|_IOW\(|_IOWR\()' 2>/dev/null || :
 .endif
 
 ${PROG}-ioctl.c: mkioctls Makefile ${DEPFILES} ${SETFILES}
@@ -38,6 +41,10 @@
 CPPFLAGS+=     -I${DESTDIR}/usr/X11R7/include/libdrm
 CPPFLAGS+=     -I${DESTDIR}/usr/X11R7/include/pixman-1
 CPPFLAGS+=     -I${DESTDIR}/usr/X11R7/include
+.if ${MKDTRACE} != 'no"
+CPPFLAGS+=     -I${NETBSDSRCDIR}/external/cddl/osnet/sys
+CPPFLAGS+=     -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+.endif
 CPPFLAGS+=     -D_ALTQ_ALTQ_JOBS_H_    # redefinition of inline
 # De-select one, dup ioctls
 CPPFLAGS+=     -D_VIA_DRM_H_           # Missing header