From 6e9e6ac4709f7fbac765105575469a2af5af675f Mon Sep 17 00:00:00 2001 From: jhb Date: Tue, 24 May 2016 23:04:16 +0000 Subject: [PATCH] MFC 299310: Don't store generated firmware object files in the source directory. Trim the leading directory of a firmware source file from the resulting target object file name so the object file is stored in the object directory. Previously, using 'FIRMWS= /path/to/fw.bin:fw.bin' would store the generated 'fw.bin.fwo' file in the /path/to directory. Now it stores it in the object directory of the kernel module being built. git-svn-id: svn://svn.freebsd.org/base/stable/8@300629 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/conf/kmod.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 8fff58223..cac703e3f 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -149,7 +149,7 @@ SRCS+= ${KMOD:S/$/.c/} CLEANFILES+= ${KMOD:S/$/.c/} .for _firmw in ${FIRMWS} -${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} +${_firmw:C/\:.*$/.fwo/:T}: ${_firmw:C/\:.*$//} @${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}} @if [ -e ${_firmw:C/\:.*$//} ]; then \ ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \ @@ -161,7 +161,7 @@ ${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} rm ${_firmw:C/\:.*$//}; \ fi -OBJS+= ${_firmw:C/\:.*$/.fwo/} +OBJS+= ${_firmw:C/\:.*$/.fwo/:T} .endfor .endif -- 2.42.0