Module Name: src
Committed By: christos
Date: Sun Nov 5 22:52:12 UTC 2017
Modified Files:
src/usr.bin/kdump: Makefile.ioctl-c
Log Message:
- fix "obsolete" skipping to handle obsolete entries that contain other
variables
- skip files particular to other xserver versions than ours.
XXX: How does this build in the build farm?
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/kdump/Makefile.ioctl-c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/kdump/Makefile.ioctl-c
diff -u src/usr.bin/kdump/Makefile.ioctl-c:1.33 src/usr.bin/kdump/Makefile.ioctl-c:1.34
--- src/usr.bin/kdump/Makefile.ioctl-c:1.33 Thu Aug 18 04:02:58 2016
+++ src/usr.bin/kdump/Makefile.ioctl-c Sun Nov 5 17:52:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ioctl-c,v 1.33 2016/08/18 08:02:58 mrg Exp $
+# $NetBSD: Makefile.ioctl-c,v 1.34 2017/11/05 22:52:12 christos Exp $
# NOTE: <bsd.own.mk> needs to be previously .included for NETBSDSRCDIR
@@ -25,7 +25,13 @@ EXTRAS= ${NETBSDSRCDIR}/external/cddl/os
.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}
+DEPFILEGLOB = ${TOOL_SED} \
+ -ne '/\/usr\/.*include\/.*\.h[ ]/{s/[ ,]obsolete//;t' \
+ -e "s/xorg_server_ver=${XORG_SERVER_VER}//;t skipserver" \
+ -e "s/xorg_server_ver=//;t" \
+ -e ":skipserver" \
+ -e 's/xenio//;t' \
+ -e 's,\.\([^ ]*\).*,${DESTDIR}\1,;p;}' ${SETFILES}
DEPFILES != (${DEPFILEGLOB}; echo ${EXTRAS}) | xargs egrep -l '(_IO\(|_IOR\(|_IOW\(|_IOWR\()' 2>/dev/null || :
.endif
