d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't truncate OBJS_DEPEND_GUESS.target from Makefile

Browse Source 
This is important to allow a Makefile to override OBJS_DEPEND_GUESS for
handling in META_MODE when its depend files are missing.

Approved by:	re (implicit)
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-06-15 23:57:32 +00:00
parent ae0b1ccbab
commit 919154d9c1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/mk/bsd.dep.mk
View File

@ -86,7 +86,7 @@ _SKIP_READ_DEPEND= 1
CLEANFILES?=
.for _S in ${SRCS:N*.[dhly]}
OBJS_DEPEND_GUESS.${_S:R}.o= ${_S}
OBJS_DEPEND_GUESS.${_S:R}.o+= ${_S}
.endfor
# Lexical analyzers
@ -94,7 +94,7 @@ OBJS_DEPEND_GUESS.${_S:R}.o= ${_S}
.for _LC in ${_LSRC:R}.c
${_LC}: ${_LSRC}
${LEX} ${LFLAGS} -o${.TARGET} ${.ALLSRC}
OBJS_DEPEND_GUESS.${_LC:R}.o= ${_LC}
OBJS_DEPEND_GUESS.${_LC:R}.o+= ${_LC}
SRCS:= ${SRCS:S/${_LSRC}/${_LC}/}
CLEANFILES+= ${_LC}
.endfor
@ -125,7 +125,7 @@ CLEANFILES+= ${_YH}
${_YC}: ${_YSRC}
${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC}
.endif
OBJS_DEPEND_GUESS.${_YC:R}.o= ${_YC}
OBJS_DEPEND_GUESS.${_YC:R}.o+= ${_YC}
.endfor
.endfor

4
share/mk/bsd.lib.mk
View File

@ -424,13 +424,13 @@ lint: ${SRCS:M*.c}
.if defined(LIB) && !empty(LIB)
OBJS_DEPEND_GUESS+= ${SRCS:M*.h}
.for _S in ${SRCS:N*.[hly]}
OBJS_DEPEND_GUESS.${_S:R}.po= ${_S}
OBJS_DEPEND_GUESS.${_S:R}.po+= ${_S}
.endfor
.endif
.if defined(SHLIB_NAME) || \
defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
.for _S in ${SRCS:N*.[hly]}
OBJS_DEPEND_GUESS.${_S:R}.So= ${_S}
OBJS_DEPEND_GUESS.${_S:R}.So+= ${_S}
.endfor
.endif