diff options
| author | obrien <obrien@FreeBSD.org> | 2000-06-17 10:51:56 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-06-17 10:51:56 +0000 |
| commit | 53eb2d3431409c4cd030d84376e5cfd29c3cd3fc (patch) | |
| tree | 9f63194b2c430b4a580a4d515fffe5c5899c7ce6 /sys | |
| parent | beeee4808aeae02ac7c4b02b3563544351d6387f (diff) | |
| download | FreeBSD-src-53eb2d3431409c4cd030d84376e5cfd29c3cd3fc.zip FreeBSD-src-53eb2d3431409c4cd030d84376e5cfd29c3cd3fc.tar.gz | |
If "MODULES_WITH_WORLD" is defined, sys/modules will be built with the
world as was our old way, rather than when building a kernel.
Some people do not like the new way, and the release building still assumes
modules are built with the world.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/Makefile | 5 | ||||
| -rw-r--r-- | sys/conf/Makefile.alpha | 2 | ||||
| -rw-r--r-- | sys/conf/Makefile.i386 | 2 | ||||
| -rw-r--r-- | sys/conf/Makefile.pc98 | 2 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/sys/Makefile b/sys/Makefile index 14331b3..6e370272 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -3,6 +3,11 @@ # The boot loader SUBDIR= boot +# KLD modules build for both a.out and ELF +.if defined(MODULES_WITH_WORLD) +SUBDIR+=modules +.endif + HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include <bsd.subdir.mk> diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 14b8c4c..eb496c6 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -274,7 +274,7 @@ kernel-reinstall kernel-reinstall.debug: install -c -m 555 -o root -g wheel -fschg \ ${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL} -.if !defined(NO_MODULES) && exists($S/modules) +.if !defined(MODULES_WITH_WORLD) && exists($S/modules) all: modules depend: modules-depend clean: modules-clean diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 8a93ac6..8460286 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -229,7 +229,7 @@ kernel-reinstall kernel-reinstall.debug: install -c -m 555 -o root -g wheel -fschg \ ${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL} -.if !defined(NO_MODULES) && exists($S/modules) +.if !defined(MODULES_WITH_WORLD) && exists($S/modules) all: modules depend: modules-depend clean: modules-clean diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 79c1ca7..870d964 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -232,7 +232,7 @@ kernel-reinstall kernel-reinstall.debug: install -c -m 555 -o root -g wheel -fschg \ ${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL} -.if !defined(NO_MODULES) && exists($S/modules) +.if !defined(MODULES_WITH_WORLD) && exists($S/modules) all: modules depend: modules-depend clean: modules-clean diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 8a93ac6..8460286 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -229,7 +229,7 @@ kernel-reinstall kernel-reinstall.debug: install -c -m 555 -o root -g wheel -fschg \ ${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL} -.if !defined(NO_MODULES) && exists($S/modules) +.if !defined(MODULES_WITH_WORLD) && exists($S/modules) all: modules depend: modules-depend clean: modules-clean |
