From d672a60908a4381676a1a470c6092c408f62caf7 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Mon, 29 Apr 2002 15:22:01 +0000
Subject: [PATCH] Parallel "make release" fixes.

---
 Makefile      | 14 +++++++++++++-
 Makefile.inc1 |  7 -------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 88c94c3100d5..5ef025f3c92d 100644
--- a/Makefile
+++ b/Makefile
@@ -84,10 +84,15 @@
 #
 TGTS=	all all-man buildkernel buildworld checkdpadd clean \
 	cleandepend cleandir depend distribute distribworld everything \
-	hierarchy includes install installcheck installkernel kernel \
+	hierarchy includes install installcheck installkernel \
 	reinstallkernel installmost installworld libraries lint \
 	mk most obj objlink regress rerelease tags update
 
+.ORDER: buildworld installworld
+.ORDER: buildworld distribworld
+.ORDER: buildkernel installkernel
+.ORDER: buildkernel reinstallkernel
+
 PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKE=	PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1
 
@@ -133,6 +138,13 @@ world: upgrade_checks
 	@printf ">>> ${OBJFORMAT} make world completed on `LC_ALL=C date`\n                        (started ${STARTTIME})\n"
 	@echo "--------------------------------------------------------------"
 
+#
+# kernel
+#
+# Short hand for `make buildkernel installkernel'
+#
+kernel: buildkernel installkernel
+
 #
 # Perform a few tests to determine if the installed tools are adequate
 # for building the world. These are for older systems (prior to 2.2.5).
diff --git a/Makefile.inc1 b/Makefile.inc1
index 051f6c18871a..fac487beada4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -495,13 +495,6 @@ installkernel reinstallkernel:
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//}
 
-#
-# kernel
-#
-# Short hand for `make buildkernel installkernel'
-#
-kernel: buildkernel installkernel
-
 #
 # update
 #