aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2005-07-19 11:21:14 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2005-07-19 11:21:14 +0000
commitdd0f39233c23451f24b71d55e6cd9e1c5ccd2b63 (patch)
treefcf290d9b45c5b93c34a35f91b9f53015aed759d /Makefile
parent2432c31c8b45fdda0598466ab3b261971f8dc1c4 (diff)
downloadsrc-dd0f39233c23451f24b71d55e6cd9e1c5ccd2b63.tar.gz
src-dd0f39233c23451f24b71d55e6cd9e1c5ccd2b63.zip
- Embed the "buildkernels" target into the "universe" target so that
the "make -n universe" output looks more builder (human) friendly. - Wrap the "universe" target into a ".if make(universe)"; it's only intended to be called directly so it should be safe to do it.
Notes
Notes: svn path=/head/; revision=148154
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 11 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 309c6907a895..b993afa89a49 100644
--- a/Makefile
+++ b/Makefile
@@ -254,6 +254,7 @@ make: .PHONY
# with a reasonable chance of success, regardless of how old your
# existing system is.
#
+.if make(universe)
universe: universe_prologue
universe_prologue:
@echo "--------------------------------------------------------------"
@@ -262,6 +263,9 @@ universe_prologue:
.for target in i386 i386:pc98 sparc64 alpha ia64 amd64
.for arch in ${target:C/:.*$//}
.for mach in ${target:C/^.*://}
+KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \
+ find [A-Z]*[A-Z] -type f -maxdepth 0
+KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/}
universe: universe_${mach}
.ORDER: universe_prologue universe_${mach} universe_epilogue
universe_${mach}:
@@ -275,7 +279,13 @@ universe_${mach}:
-cd ${.CURDIR}/sys/${mach}/conf && ${MAKE} LINT \
> ${.CURDIR}/_.${mach}.makeLINT 2>&1
.endif
- cd ${.CURDIR} && ${MAKE} buildkernels TARGET_ARCH=${arch} TARGET=${mach}
+.for kernel in ${KERNCONFS}
+ -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
+ TARGET_ARCH=${arch} TARGET=${mach} \
+ KERNCONF=${kernel} \
+ __MAKE_CONF=/dev/null \
+ > _.${mach}.${kernel} 2>&1
+.endfor
@echo ">> ${mach} completed on `LC_ALL=C date`"
.endfor
.endfor
@@ -286,15 +296,4 @@ universe_epilogue:
@echo ">>> make universe completed on `LC_ALL=C date`"
@echo " (started ${STARTTIME})"
@echo "--------------------------------------------------------------"
-
-.if make(buildkernels)
-KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \
- find [A-Z]*[A-Z] -type f -maxdepth 0 ! -name NOTES
-buildkernels:
-.for kernel in ${KERNCONFS}
- -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
- KERNCONF=${kernel} \
- __MAKE_CONF=/dev/null \
- > _.${TARGET}.${kernel} 2>&1
-.endfor
.endif