Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/Makefile,v rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.170 retrieving revision 1.188 diff -u -p -r1.170 -r1.188 --- src/Makefile 2002/04/29 12:09:13 1.170 +++ src/Makefile 2002/09/21 08:19:28 1.188 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.170 2002/04/29 12:09:13 lukem Exp $ +# $NetBSD: Makefile,v 1.188 2002/09/21 08:19:28 lukem Exp $ # This is the top-level makefile for building NetBSD. For an outline of # how to build a snapshot or release, as well as other release engineering @@ -19,17 +19,15 @@ # software. It defaults to /. Note that programs are built against # libraries installed in DESTDIR. # MKMAN, if set to `no', will prevent building of manual pages. -# MKOBJDIRS, if not set to `no', will build object directories at +# MKOBJDIRS, if not set to `no', will build object directories at # an appropriate point in a build. # MKSHARE, if set to `no', will prevent building and installing # anything in /usr/share. -# NBUILDJOBS is the number of jobs to start in parallel during a -# `make build'. It defaults to 1. # UPDATE, if defined, will avoid a `make cleandir' at the start of -# `make build', as well as having the effects listed in -# /usr/share/mk/bsd.README. +# `make build', as well as having the effects listed in +# /usr/share/mk/bsd.README. # NOCLEANDIR, if defined, will avoid a `make cleandir' at the start -# of the `make build'. +# of the `make build'. # NOINCLUDES will avoid the `make includes' usually done by `make build'. # # Targets: @@ -50,8 +48,10 @@ # do-distrib-dirs: creates the distribution directories. # includes: installs include files. # do-lib-csu: builds and installs prerequisites from lib/csu. +# do-lib-libc: builds and installs prerequisites from lib/libc. # do-lib: builds and installs prerequisites from lib. # do-gnu-lib: builds and installs prerequisites from gnu/lib. +# do-ld.elf_so: builds and installs prerequisites from libexec/ld.elf_so # do-build: builds and installs the entire system. .if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == "" @@ -79,17 +79,8 @@ _SRC_TOP_OBJ_= .endfor .endif -.if defined(NBUILDJOBS) -.if !target(.BEGIN) -.BEGIN: - @echo 'NBUILDJOBS is currently broken; see PR toolchain/14837.' - @false -.endif -#_J= -j${NBUILDJOBS} -.endif - _SUBDIR= tools lib include gnu bin games libexec sbin usr.bin -_SUBDIR+= usr.sbin share sys etc distrib regress +_SUBDIR+= usr.sbin share rescue sys etc distrib regress # Weed out directories that don't exist. @@ -105,17 +96,29 @@ regression-tests: @(cd ${.CURDIR}/regress && ${MAKE} regress) .endif -afterinstall: postinstall-check +.if defined(UNPRIVED) +NOPOSTINSTALL= # defined +.endif + +afterinstall: .if ${MKMAN} != "no" (cd ${.CURDIR}/share/man && ${MAKE} makedb) .endif .if defined(UNPRIVED) && (${MKINFO} != "no") (cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta) .endif +.if !defined(NOPOSTINSTALL) + (cd ${.CURDIR} && ${MAKE} postinstall-check) +.endif postinstall-check: @echo " === Post installation checks ===" - sh ${.CURDIR}/etc/postinstall -s ${.CURDIR}/etc -d ${DESTDIR}/etc check + sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check + @echo " ================================" + +postinstall-fix: .NOTMAIN + @echo " === Post installation fixes ===" + sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix @echo " ================================" @@ -137,7 +140,7 @@ BUILDTARGETS+= do-distrib-dirs .if !defined(NOINCLUDES) BUILDTARGETS+= includes .endif -BUILDTARGETS+= do-lib-csu do-lib do-gnu-lib do-build +BUILDTARGETS+= do-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.elf_so do-build # Enforce proper ordering of some rules. @@ -151,31 +154,44 @@ build: .if defined(BUILD_DONE) @echo "Build already installed into ${DESTDIR}" .else - @echo -n "Build started at: " && date + @printf "Build started at: " && date .for tgt in ${BUILDTARGETS} - @(cd ${.CURDIR} && ${MAKE} ${_J} ${tgt}) + @(cd ${.CURDIR} && ${MAKE} ${tgt}) .endfor - @echo -n "Build finished at: " && date + @printf "Build finished at: " && date .endif # Build a full distribution, but not a release (i.e. no sets into # ${RELEASEDIR}). -distribution: build +distribution: + (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build) (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution) +.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/" + (cd ${.CURDIR}/distrib/sets && ${MAKE} checkflist) +.endif + @printf "make ${.TARGET} finished at: " && date -# Build a release or snapshot (implies "make build"). +# Build a release or snapshot (implies "make build"). Note that +# in this case, the set lists will be checked before the tar files +# are made. -release snapshot: build +release snapshot: + (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build) (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) + @printf "make ${.TARGET} finished at: " && date # Special components of the "make build" process. check-tools: -.if defined(USE_NEW_TOOLCHAIN) && (${USE_NEW_TOOLCHAIN} != "nowarn") - @echo '*** WARNING: Building on MACHINE=${MACHINE} with USE_NEW_TOOLCHAIN.' - @echo '*** This platform is not yet verified to work with the new toolchain,' - @echo '*** and may result in a failed build or corrupt binaries!' +.if ${TOOLCHAIN_MISSING} == "yes" && !defined(EXTERNAL_TOOLCHAIN) + @echo '*** WARNING: Building on MACHINE=${MACHINE} with missing toolchain.' + @echo '*** May result in a failed build or corrupt binaries!' +.elif defined(EXTERNAL_TOOLCHAIN) + @echo '*** Using external toolchain rooted at ${EXTERNAL_TOOLCHAIN}.' +.endif +.if defined(NBUILDJOBS) + @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!' .endif do-distrib-dirs: @@ -185,16 +201,21 @@ do-distrib-dirs: (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs) .endif -.for dir in tools lib/csu lib gnu/lib +.for dir in tools lib/csu lib/libc lib gnu/lib do-${dir:S/\//-/}: .for targ in dependall install - (cd ${.CURDIR}/${dir} && ${MAKE} ${_J} ${targ}) + (cd ${.CURDIR}/${dir} && ${MAKE} ${targ}) .endfor .endfor +do-ld.elf_so: +.for targ in dependall install + (cd ${.CURDIR}/libexec/ld.elf_so && ${MAKE} ${targ}) +.endfor + do-build: .for targ in dependall install - (cd ${.CURDIR} && ${MAKE} ${_J} ${targ} BUILD_tools=no BUILD_lib=no) + (cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no) .endfor # Speedup stubs for some subtrees that don't need to run these rules. @@ -213,12 +234,9 @@ install-${dir}: dependall-distrib depend-distrib all-distrib: @true -clean: - rm -f METALOG - .include .include build-docs: ${.CURDIR}/BUILDING -${.CURDIR}/BUILDING: BUILDING.mdoc +${.CURDIR}/BUILDING: doc/BUILDING.mdoc groff -mdoc -Tascii -P-b -P-u -P-o $> >$@