Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk bsd.dep.mk: fix "make tags" (again)
details: https://anonhg.NetBSD.org/src/rev/27b1bb410743
branches: trunk
changeset: 973446:27b1bb410743
user: lukem <lukem%NetBSD.org@localhost>
date: Wed Jul 01 07:38:29 2020 +0000
description:
bsd.dep.mk: fix "make tags" (again)
[repeat revision 1.85]
Fix "make tags" to actually build a tags file:
- Use !commands() instead of !target(), so that the rule actually works
- Write to ${.OBJDIR}/tags for read-only source (don't know why ${.TARGET}
isn't sufficient).
- Only match *.[cly] from ${.ALLSRCS} - just excluding *.h causes failures
because of ${targ}: subdir-${targ} in bsd.subdir.mk.
Thanks to uwe@ for assistance.
diffstat:
share/mk/bsd.dep.mk | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (30 lines):
diff -r 3fc0afa60188 -r 27b1bb410743 share/mk/bsd.dep.mk
--- a/share/mk/bsd.dep.mk Wed Jul 01 07:16:37 2020 +0000
+++ b/share/mk/bsd.dep.mk Wed Jul 01 07:38:29 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.86 2020/06/22 01:04:26 lukem Exp $
+# $NetBSD: bsd.dep.mk,v 1.87 2020/07/01 07:38:29 lukem Exp $
##### Basic targets
realdepend: beforedepend .depend afterdepend
@@ -94,16 +94,16 @@
##### Clean rules
.if defined(SRCS) && !empty(SRCS)
-CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} ${.CURDIR}/tags ${CLEANDEPEND}
+CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} tags ${CLEANDEPEND}
.endif
##### Custom rules
-.if !target(tags)
+.if !commands(tags)
tags: ${SRCS}
.if defined(SRCS) && !empty(SRCS)
${_MKTARGET_CREATE}
- -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
- ${TOOL_SED} "s;\${.CURDIR}/;;" > tags
+ -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:M*.[cly]} | \
+ ${TOOL_SED} "s;\${.CURDIR}/;;" > ${.OBJDIR}/tags
.endif
.endif
Home |
Main Index |
Thread Index |
Old Index