aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile14
-rw-r--r--Makefile.inc17
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
@@ -134,6 +139,13 @@ world: upgrade_checks
@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
@@ -496,13 +496,6 @@ installkernel reinstallkernel:
${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//}
#
-# kernel
-#
-# Short hand for `make buildkernel installkernel'
-#
-kernel: buildkernel installkernel
-
-#
# update
#
# Update the source tree, by running sup and/or running cvs to update to the