From owner-svn-src-all@freebsd.org  Wed Feb 24 17:18:57 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2050EAB313F;
 Wed, 24 Feb 2016 17:18:57 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E44911434;
 Wed, 24 Feb 2016 17:18:56 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1OHIt7g089479;
 Wed, 24 Feb 2016 17:18:55 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1OHItct089478;
 Wed, 24 Feb 2016 17:18:55 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201602241718.u1OHItct089478@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 24 Feb 2016 17:18:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295982 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Feb 2016 17:18:57 -0000

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}