Author: ru
Date: Thu Jan 21 13:15:14 2010
New Revision: 202747
URL: http://svn.freebsd.org/changeset/base/202747
Log:
MFC r202578 and r202579:
If CTAGS is not set or set to something other than "ctags" or "gtags",
"cleandepend" was not removing the .depend file; fixed. [1]
Allow the CTAGS to be set to something other than "gtags" or "ctags",
but assume it supports a ctags(1)-compatible syntax. [2]
PR: 126747 [1], 46676 [2]
Modified:
stable/8/share/mk/bsd.dep.mk
Directory Properties:
stable/8/share/mk/ (props changed)
Modified: stable/8/share/mk/bsd.dep.mk
==============================================================================
--- stable/8/share/mk/bsd.dep.mk Thu Jan 21 13:00:28 2010
(r202746)
+++ stable/8/share/mk/bsd.dep.mk Thu Jan 21 13:15:14 2010
(r202747)
@@ -58,14 +58,14 @@ DEPENDFILE?= .depend
# Keep `tags' here, before SRCS are mangled below for `depend'.
.if !target(tags) && defined(SRCS) && !defined(NO_TAGS)
tags: ${SRCS}
-.if ${CTAGS:T} == "ctags"
- @${CTAGS} ${CTAGSFLAGS} -f /dev/stdout \
- ${.ALLSRC:N*.h} | sed "s;${.CURDIR}/;;" > ${.TARGET}
-.elif ${CTAGS:T} == "gtags"
+.if ${CTAGS:T} == "gtags"
@cd ${.CURDIR} && ${CTAGS} ${GTAGSFLAGS} ${.OBJDIR}
.if defined(HTML)
@cd ${.CURDIR} && htags ${HTAGSFLAGS} -d ${.OBJDIR} ${.OBJDIR}
.endif
+.else
+ @${CTAGS} ${CTAGSFLAGS} -f /dev/stdout \
+ ${.ALLSRC:N*.h} | sed "s;${.CURDIR}/;;" > ${.TARGET}
.endif
.endif
@@ -175,13 +175,13 @@ afterdepend:
.if !target(cleandepend)
cleandepend:
.if defined(SRCS)
-.if ${CTAGS:T} == "ctags"
- rm -f ${DEPENDFILE} tags
-.elif ${CTAGS:T} == "gtags"
+.if ${CTAGS:T} == "gtags"
rm -f ${DEPENDFILE} GPATH GRTAGS GSYMS GTAGS
.if defined(HTML)
rm -rf HTML
.endif
+.else
+ rm -f ${DEPENDFILE} tags
.endif
.endif
.endif
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
