From owner-svn-src-projects@FreeBSD.ORG  Fri May 29 06:45:33 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0B00EFE3;
 Fri, 29 May 2015 06:45:33 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 EE0CB1E9F;
 Fri, 29 May 2015 06:45:32 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4T6jW3X051776;
 Fri, 29 May 2015 06:45:32 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4T6jWd9051775;
 Fri, 29 May 2015 06:45:32 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201505290645.t4T6jWd9051775@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 29 May 2015 06:45:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r283689 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 May 2015 06:45:33 -0000

Author: sjg
Date: Fri May 29 06:45:32 2015
New Revision: 283689
URL: https://svnweb.freebsd.org/changeset/base/283689

Log:
  Allow AUTO_OBJ with out META_MODE.
  Remove frobbing of SRCCONF etc - not strictly relevant to meta mode.

Modified:
  projects/bmake/share/mk/local.sys.mk

Modified: projects/bmake/share/mk/local.sys.mk
==============================================================================
--- projects/bmake/share/mk/local.sys.mk	Fri May 29 06:44:09 2015	(r283688)
+++ projects/bmake/share/mk/local.sys.mk	Fri May 29 06:45:32 2015	(r283689)
@@ -7,7 +7,7 @@ _TARGETS:= ${.TARGETS}
 .endif
 
 .if (!empty(_TARGETS) && ${_TARGETS:Nbuildworld:Nuniverse:Ninstallworld} == "") || defined(WITHOUT_META_MODE)
-MK_AUTO_OBJ= no
+MK_AUTO_OBJ?= no
 MK_META_MODE= no
 MK_STAGING= no
 MK_STAGING_PROG= no
@@ -15,11 +15,6 @@ MK_SYSROOT= no
 UPDATE_DEPENDFILE=NO
 .endif
 
-SRCCONF:= ${.PARSEDIR}/src.conf
-# ensure we are self contained
-__MAKE_CONF:= ${SRCCONF}
-.-include "src.conf"
-
 # some handy macros
 _this = ${.PARSEDIR:tA}/${.PARSEFILE}
 # some useful modifiers