aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2000-01-09 18:17:48 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2000-01-09 18:17:48 +0000
commit549f978ab6fab1b324e5d316ddba86923b1be11d (patch)
treea6cfd29e413bcbeebd477d01b0f907b19a504857
parentb7db0275e2cd3cc4ad53b0922186d0b02b0032a4 (diff)
downloadsrc-549f978ab6fab1b324e5d316ddba86923b1be11d.tar.gz
src-549f978ab6fab1b324e5d316ddba86923b1be11d.zip
Add the buildkernel and installkernel targets.
While here fix some minor style bugs (whitespacing) and move the make target from Makefile.upgrade to this file. Simplify the make target to make it readable.
Notes
Notes: svn path=/head/; revision=55678
-rw-r--r--Makefile34
1 files changed, 25 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index a04958bbc2a8..e3fe5c2c0c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -80,10 +80,10 @@
# Define the user-driven targets. These are listed here in alphabetical
# order, but that's not important.
#
-TGTS = afterdistribute all buildworld checkdpadd clean cleandepend cleandir \
- depend distribute everything hierarchy includes install installmost \
- installworld lint maninstall mk most obj objlink regress rerelease \
- tags update
+TGTS= afterdistribute all buildkernel buildworld checkdpadd clean \
+ cleandepend cleandir depend distribute everything hierarchy includes \
+ install installkernel installmost installworld lint maninstall mk \
+ most obj objlink regress rerelease tags update
PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1
@@ -91,7 +91,7 @@ MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1
#
# Handle the user-driven targets, using the source relative mk files.
#
-${TGTS} : upgrade_checks
+${TGTS}: upgrade_checks
@cd ${.CURDIR}; \
${MAKE} ${.TARGET}
@@ -139,20 +139,36 @@ world: upgrade_checks
# so the normal make world is capable of doing what is required to update
# the system to current.
#
-upgrade_checks :
- @cd ${.CURDIR}; if `make -m ${.CURDIR}/share/mk test > /dev/null 2>&1`; then ok=1; else ${MAKE} -f Makefile.upgrade make; fi;
+upgrade_checks:
+ @cd ${.CURDIR}; \
+ if ! make -m ${.CURDIR}/share/mk test > /dev/null 2>&1; then \
+ make make; \
+ fi
#
# A simple test target used as part of the test to see if make supports
# the -m argument.
#
-test :
+test:
+
+#
+# Upgrade the installed make to the current version using the installed
+# headers, libraries and build tools. This is required on installed versions
+# prior to 2.2.5 in which the installed make doesn't support the -m argument.
+#
+make:
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo " Upgrading the installed make"
+ @echo "--------------------------------------------------------------"
+ @cd ${.CURDIR}/usr.bin/make; \
+ make obj && make depend && make all && make install
#
# Define the upgrade targets. These are listed here in alphabetical
# order, but that's not important.
#
-UPGRADE = aout-to-elf aout-to-elf-build aout-to-elf-install \
+UPGRADE= aout-to-elf aout-to-elf-build aout-to-elf-install \
move-aout-libs
#