svn commit: r211436 - head

[Dag-Erling Smorgrav]

Author: des
Date: Tue Aug 17 20:26:17 2010
New Revision: 211436
URL: http://svn.freebsd.org/changeset/base/211436

Log:
  Split kernel stage 3.2 (build everything) into 3.2 (build the kernel)
  and 3.3 (build the modules).  IMHO, this makes it a little easier to
  track the progress of a kernel build using whereintheworld et al.
  
  MFC after:	3 weeks

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Aug 17 17:30:56 2010	(r211435)
+++ head/Makefile.inc1	Tue Aug 17 20:26:17 2010	(r211436)
@@ -814,9 +814,16 @@ buildkernel:
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> stage 3.2: building everything"
+	@echo ">>> stage 3.2: building the kernel"
 	@echo "--------------------------------------------------------------"
-	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ
+	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} kernel-all -DNO_MODULES_OBJ
+	@echo
+.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> stage 3.3: building the modules"
+	@echo "--------------------------------------------------------------"
+	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} modules-all -DNO_MODULES_OBJ
+.endif
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"