Date: Wed, 24 Feb 2016 17:18:55 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295982 - head/share/mk Message-ID: <201602241718.u1OHItct089478@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Feb 24 17:18:55 2016 New Revision: 295982 URL: https://svnweb.freebsd.org/changeset/base/295982 Log: Follow-up r295667 with fixes for SRCS defined. cleandepend should always remove CLEANDEPEND* if they are not empty, but bsd.dep.mk should not add the tags entries unless SRCS is defined as it did before. The .depend file itself it still always removed to avoid accidentally keeping a stale one around as done in r295666. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.dep.mk Modified: head/share/mk/bsd.dep.mk ============================================================================== --- head/share/mk/bsd.dep.mk Wed Feb 24 17:18:52 2016 (r295981) +++ head/share/mk/bsd.dep.mk Wed Feb 24 17:18:55 2016 (r295982) @@ -268,6 +268,7 @@ afterdepend: .endif .endif +.if defined(SRCS) .if ${CTAGS:T} == "gtags" CLEANDEPENDFILES+= GPATH GRTAGS GSYMS GTAGS .if defined(HTML) @@ -276,15 +277,16 @@ CLEANDEPENDDIRS+= HTML .else CLEANDEPENDFILES+= tags .endif +.endif .if !target(cleandepend) cleandepend: -.if defined(SRCS) +.if !empty(CLEANDEPENDFILES) rm -f ${CLEANDEPENDFILES} +.endif .if !empty(CLEANDEPENDDIRS) rm -rf ${CLEANDEPENDDIRS} .endif .endif -.endif .if !target(checkdpadd) && (defined(DPADD) || defined(LDADD)) _LDADD_FROM_DPADD= ${DPADD:R:T:C;^lib(.*)$;-l\1;g}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602241718.u1OHItct089478>