diff options
| author | chuckr <chuckr@FreeBSD.org> | 2000-05-02 02:26:04 +0000 |
|---|---|---|
| committer | chuckr <chuckr@FreeBSD.org> | 2000-05-02 02:26:04 +0000 |
| commit | 5f34b128da2061546def2185c6991fc51064d296 (patch) | |
| tree | 01150dd7acf3c40d1274d32758b646fadab776b5 /sys/conf/Makefile.i386 | |
| parent | 21339626a4f2df2e976aca814d34ccf99ef7b8c5 (diff) | |
| download | FreeBSD-src-5f34b128da2061546def2185c6991fc51064d296.zip FreeBSD-src-5f34b128da2061546def2185c6991fc51064d296.tar.gz | |
Cause modules to build with the kernel build. Modules are removed
from the sys Makefile's SUBDIRs. This is conditioned in make.conf by the
NO_MODULES variable and the existence of the modules directory. The
actual location of the modules is not modified. Changes in Makefiles
only, this does not affect Peter's recent changes.
Reviewed by: Peter Wemm, who warned me I would get some flack, and
he had the good idea for the NO_MODULES variable.
Diffstat (limited to 'sys/conf/Makefile.i386')
| -rw-r--r-- | sys/conf/Makefile.i386 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 089e4b8..b3c4b5f 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -118,6 +118,9 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o @echo linking ${.TARGET} ${SYSTEM_LD} ${SYSTEM_LD_TAIL} +.if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) + cd ${.CURDIR}/../../modules && ${MAKE} all +.endif .if !exists(.depend) ${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} @@ -135,6 +138,9 @@ clean: vers.c vnode_if.c vnode_if.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${CLEAN} +.if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) + cd ${.CURDIR}/../../modules && ${MAKE} clean +.endif #lint: /tmp param.c # @lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \ @@ -184,9 +190,15 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES} rm -f .depend mv -f .newdep .depend +.if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) + cd ${.CURDIR}/../../modules && ${MAKE} depend +.endif cleandepend: rm -f .depend +.if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) + cd ${.CURDIR}/../../modules && ${MAKE} cleandepend +.endif links: egrep '#if' ${CFILES} | sed -f $S/conf/defines | \ @@ -213,10 +225,16 @@ install install.debug: .endif install -c -m 555 -o root -g wheel -fschg \ ${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL} +.if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) + cd ${.CURDIR}/../../modules && ${MAKE} install +.endif reinstall reinstall.debug: install -c -m 555 -o root -g wheel -fschg \ ${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL} +.if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) + cd ${.CURDIR}/../../modules && ${MAKE} install +.endif config.o: ${NORMAL_C} |
