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.156 retrieving revision 1.184 diff -u -p -r1.156 -r1.184 --- src/Makefile 2001/11/15 19:32:19 1.156 +++ src/Makefile 2002/08/26 04:40:20 1.184 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.156 2001/11/15 19:32:19 tv Exp $ +# $NetBSD: Makefile,v 1.184 2002/08/26 04:40:20 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: @@ -52,12 +50,19 @@ # do-lib-csu: builds and installs prerequisites from lib/csu. # 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} == "" .MAKEFLAGS: -m ${.CURDIR}/share/mk .endif +# If _SRC_TOP_OBJ_ gets set here, we will end up with a directory that may +# not be the top level objdir, because "make obj" can happen in the *middle* +# of "make build" (long after is calculated it). So, pre-set +# _SRC_TOP_OBJ_ here so it will not be added to ${.MAKEOVERRIDES}. +_SRC_TOP_OBJ_= + .include # Sanity check: make sure that "make build" is not invoked simultaneously @@ -73,12 +78,8 @@ .endfor .endif -.if defined(NBUILDJOBS) -_J= -j${NBUILDJOBS} -.endif - -_SUBDIR= tools lib include gnu bin games libexec sbin usr.bin \ - usr.sbin share sys etc distrib regress +_SUBDIR= tools lib include gnu bin games libexec sbin usr.bin +_SUBDIR+= usr.sbin share rescue sys etc distrib regress # Weed out directories that don't exist. @@ -94,11 +95,31 @@ regression-tests: @(cd ${.CURDIR}/regress && ${MAKE} regress) .endif +.if defined(UNPRIVED) +NOPOSTINSTALL= # defined +.endif + +afterinstall: .if ${MKMAN} != "no" -afterinstall: whatis.db -whatis.db: (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} -d ${DESTDIR}/ check + @echo " ================================" + +postinstall-fix: .NOTMAIN + @echo " === Post installation fixes ===" + sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix + @echo " ================================" + # Targets (in order!) called by "make build". @@ -118,7 +139,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 do-gnu-lib do-ld.elf_so do-build # Enforce proper ordering of some rules. @@ -132,16 +153,29 @@ 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 release or snapshot (implies "make build"). +# Build a full distribution, but not a release (i.e. no sets into +# ${RELEASEDIR}). + +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 -release snapshot: 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: + (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build) (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) # Special components of the "make build" process. @@ -152,6 +186,9 @@ check-tools: @echo '*** This platform is not yet verified to work with the new toolchain,' @echo '*** and may result in a failed build or corrupt binaries!' .endif +.if defined(NBUILDJOBS) + @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!' +.endif do-distrib-dirs: .if !defined(DESTDIR) || ${DESTDIR} == "" @@ -163,13 +200,18 @@ do-distrib-dirs: .for dir in tools lib/csu 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.