From owner-svn-src-all@freebsd.org  Sat Mar  4 20:35:35 2017
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 C75FCCF9D72;
 Sat,  4 Mar 2017 20:35:35 +0000 (UTC)
 (envelope-from ngie@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 942521220;
 Sat,  4 Mar 2017 20:35:35 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24KZYF8058556;
 Sat, 4 Mar 2017 20:35:34 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24KZYUv058554;
 Sat, 4 Mar 2017 20:35:34 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703042035.v24KZYUv058554@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 4 Mar 2017 20:35:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314676 - in head/usr.sbin/amd: amd libamu
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.23
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: Sat, 04 Mar 2017 20:35:35 -0000

Author: ngie
Date: Sat Mar  4 20:35:34 2017
New Revision: 314676
URL: https://svnweb.freebsd.org/changeset/base/314676

Log:
  Fix build after r314656
  
  Some of the changes I introduced to use .ALLSRC were correct in spirit,
  but incorrect in reality -- in particular, ../Makefile.inc hadn't been
  pulled in via bsd.init.mk (via bsd.lib.mk, bsd.prog.mk), so the value
  of .ALLSRC (evaluated immediately) was empty. .include bsd.init.mk
  explicitly so we can be certain that the values used as dependencies in
  the targets are defined when the target recipe has been evaluated.
  
  Reminder: thou shalt separate out separate functional changes before
            committing them.
  
  (YUGE) Pointyhat to:	ngie
  In collaboration with:	bdrewery
  MFC after:	1 month
  Reported by:	Jenkins, cy, ler, O. Hartmann, Michael Butler
  Sponsored by:	Dell EMC Isilon

Modified:
  head/usr.sbin/amd/amd/Makefile
  head/usr.sbin/amd/libamu/Makefile

Modified: head/usr.sbin/amd/amd/Makefile
==============================================================================
--- head/usr.sbin/amd/amd/Makefile	Sat Mar  4 20:06:47 2017	(r314675)
+++ head/usr.sbin/amd/amd/Makefile	Sat Mar  4 20:35:34 2017	(r314676)
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 .PATH:	${SRCTOP}/contrib/amd/amd
 

Modified: head/usr.sbin/amd/libamu/Makefile
==============================================================================
--- head/usr.sbin/amd/libamu/Makefile	Sat Mar  4 20:06:47 2017	(r314675)
+++ head/usr.sbin/amd/libamu/Makefile	Sat Mar  4 20:35:34 2017	(r314676)
@@ -5,6 +5,8 @@
 #
 # $FreeBSD$
 
+.include <bsd.init.mk>
+
 .PATH:	${SRCTOP}/contrib/amd/libamu \
 	${SRCTOP}/contrib/amd/conf/transp \
 	${SRCTOP}/contrib/amd/conf/mtab \