From owner-svn-src-all@freebsd.org  Tue Jan 19 22:41:59 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 7C41AA87276;
 Tue, 19 Jan 2016 22:41:59 +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 4EE8A1787;
 Tue, 19 Jan 2016 22:41:59 +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 u0JMfwuE064512;
 Tue, 19 Jan 2016 22:41:58 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0JMfwNk064511;
 Tue, 19 Jan 2016 22:41:58 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201601192241.u0JMfwNk064511@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: Tue, 19 Jan 2016 22:41:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294351 - 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: Tue, 19 Jan 2016 22:41:59 -0000

Author: bdrewery
Date: Tue Jan 19 22:41:58 2016
New Revision: 294351
URL: https://svnweb.freebsd.org/changeset/base/294351

Log:
  FAST_DEPEND: Still use if filemon is not used.
  
  If filemon is used then there is no need to generate dependency files during
  compilation as the .meta files will achieve the same result.
  
  This is a temporary solution until FAST_DEPEND is default.  Once that is
  default there will be an option to disable dependency generation entirely
  as it is only useful if an incremental build is planned, thus META_MODE+filemon
  can enable that option to short-circuit all FAST_DEPEND-related logic.
  
  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	Tue Jan 19 22:41:55 2016	(r294350)
+++ head/share/mk/bsd.dep.mk	Tue Jan 19 22:41:58 2016	(r294351)
@@ -150,7 +150,8 @@ beforedepend: ${DHDRS}
 beforebuild: ${DHDRS}
 
 
-.if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Mmeta*} == ""
+.if ${MK_FAST_DEPEND} == "yes" && \
+    (${.MAKE.MODE:Mmeta} == "" || ${.MAKE.MODE:Mnofilemon} != "")
 DEPENDFILES+=	${DEPENDFILE}.*
 DEPEND_MP?=	-MP
 # Handle OBJS=../somefile.o hacks.  Just replace '/' rather than use :T to