diff options
| author | bde <bde@FreeBSD.org> | 1998-03-06 05:43:46 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-03-06 05:43:46 +0000 |
| commit | 1d5c36420ae62e984c3f057eda3e2c0bcf0d5b89 (patch) | |
| tree | d8a0f7e45e46771f5f95df46e36dab629075076a /share/mk/bsd.kmod.mk | |
| parent | e836f658553281ce915b8aaf5915c7ff190ad5c1 (diff) | |
| download | FreeBSD-src-1d5c36420ae62e984c3f057eda3e2c0bcf0d5b89.zip FreeBSD-src-1d5c36420ae62e984c3f057eda3e2c0bcf0d5b89.tar.gz | |
Fixed dependencies of ${PROG} on ${DPSRCS} and `all' on ${_ILINKS}.
There were various races for `make -j'. Half-built versions of
vnode_if.h were sometimes #included...
Removed a null dependency.
Diffstat (limited to 'share/mk/bsd.kmod.mk')
| -rw-r--r-- | share/mk/bsd.kmod.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index f866f7f..447c81f 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.kmod.mk,v 1.43 1998/02/01 17:19:54 bde Exp $ +# $Id: bsd.kmod.mk,v 1.44 1998/02/20 15:52:49 bde Exp $ # # The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules. # @@ -125,7 +125,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} PROG= ${KMOD}.o .endif -${PROG}: ${DPSRCS} ${OBJS} ${DPADD} +${PROG}: ${OBJS} ${DPADD} ${LD} -r ${LDFLAGS} -o tmp.o ${OBJS} .if defined(EXPORT_SYMS) @rm -f symb.tmp @@ -149,9 +149,9 @@ all-man: _ILINKS=@ machine .MAIN: all -all: ${_ILINKS} objwarn ${PROG} all-man _SUBDIR +all: objwarn ${PROG} all-man _SUBDIR -beforedepend: ${_ILINKS} +beforedepend ${OBJS}: ${_ILINKS} # The search for the link targets works best if we are in a normal src # tree, and not too deeply below src/lkm. If we are near "/", then @@ -233,8 +233,11 @@ KERN= ${.CURDIR}/../../sys/kern vnode_if.h: ${KERN}/vnode_if.sh ${KERN}/vnode_if.src sh ${KERN}/vnode_if.sh ${KERN}/vnode_if.src -./vnode_if.h: vnode_if.h - .include <bsd.obj.mk> .include <bsd.dep.mk> + +.if !exists(${DEPENDFILE}) +${OBJS}: ${DPSRCS} +.endif + .include <bsd.kern.mk> |
