aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-06-17 10:51:56 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-06-17 10:51:56 +0000
commitf94a3783cff548a87ed576943c2267004058d98e (patch)
treee214d47f96193b156d29fa409a41b64db77bcc3c /sys
parent1ddb0ab5552afc7de603b2a98715f866720537e7 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/Makefile5
-rw-r--r--sys/conf/Makefile.alpha2
-rw-r--r--sys/conf/Makefile.i3862
-rw-r--r--sys/conf/Makefile.pc982
-rw-r--r--sys/conf/Makefile.powerpc2
5 files changed, 9 insertions, 4 deletions
diff --git a/sys/Makefile b/sys/Makefile
index 14331b3bbfa65..6e3702727c6cd 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 14b8c4c5f8f4e..eb496c66a99d6 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 8a93ac67b21f6..8460286780890 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 79c1ca7bd052f..870d96490b385 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 8a93ac67b21f6..8460286780890 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