diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-06-15 23:57:32 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-06-15 23:57:32 +0000 |
| commit | a9f6ba59c04c8c2ab7b38b2540476fea9221d993 (patch) | |
| tree | 7426516ebe9912ea7ccdad6b9b5f4932f0f4384f | |
| parent | 9b91f224a1c593ec00b5c9de9de751de231d379e (diff) | |
| download | FreeBSD-src-a9f6ba59c04c8c2ab7b38b2540476fea9221d993.zip FreeBSD-src-a9f6ba59c04c8c2ab7b38b2540476fea9221d993.tar.gz | |
Don't truncate OBJS_DEPEND_GUESS.target from Makefile
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
| -rw-r--r-- | share/mk/bsd.dep.mk | 6 | ||||
| -rw-r--r-- | share/mk/bsd.lib.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index c371171..117ea2a 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -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 diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 0b7bb02..ffb03c0 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -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 |
