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
This commit is contained in:
Enji Cooper 2017-03-04 20:35:34 +00:00
parent e0db0ddb39
commit 81a687a7ff
2 changed files with 3 additions and 1 deletions

View File

@ -6,7 +6,7 @@
# $FreeBSD$
#
.include <src.opts.mk>
.include <bsd.init.mk>
.PATH: ${SRCTOP}/contrib/amd/amd

View File

@ -5,6 +5,8 @@
#
# $FreeBSD$
.include <bsd.init.mk>
.PATH: ${SRCTOP}/contrib/amd/libamu \
${SRCTOP}/contrib/amd/conf/transp \
${SRCTOP}/contrib/amd/conf/mtab \