Module Name: src
Committed By: lukem
Date: Mon Jun 22 01:04:26 UTC 2020
Modified Files:
src/share/mk: bsd.dep.mk
Log Message:
bsd.dep.mk: revert 1.85 (for now)
Revert my recent 1.85 revision that fixed "make tags". It causes too
much build breakage elsewhere in the tree that needs to be resolved first.
Issues include:
- Directories using TESTS_CXX with .cpp and .cxx extension instead of the
default .cc extension (see bsd.prog.mk). Most of these have been fixed.
- external/gpl3/gcc build of .cc files. (No idea what's wrong there).
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/share/mk/bsd.dep.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.85 src/share/mk/bsd.dep.mk:1.86
--- src/share/mk/bsd.dep.mk:1.85 Sun Jun 21 03:39:21 2020
+++ src/share/mk/bsd.dep.mk Mon Jun 22 01:04:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.85 2020/06/21 03:39:21 lukem Exp $
+# $NetBSD: bsd.dep.mk,v 1.86 2020/06/22 01:04:26 lukem Exp $
##### Basic targets
realdepend: beforedepend .depend afterdepend
@@ -94,16 +94,16 @@ _MKDEP_FILEFLAGS=
##### Clean rules
.if defined(SRCS) && !empty(SRCS)
-CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} tags ${CLEANDEPEND}
+CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} ${.CURDIR}/tags ${CLEANDEPEND}
.endif
##### Custom rules
-.if !commands(tags)
+.if !target(tags)
tags: ${SRCS}
.if defined(SRCS) && !empty(SRCS)
${_MKTARGET_CREATE}
- -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:M*.[cly]} | \
- ${TOOL_SED} "s;\${.CURDIR}/;;" > ${.OBJDIR}/tags
+ -cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
+ ${TOOL_SED} "s;\${.CURDIR}/;;" > tags
.endif
.endif
