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.150 retrieving revision 1.180 diff -u -p -r1.150 -r1.180 --- src/Makefile 2001/11/01 16:34:21 1.150 +++ src/Makefile 2002/06/26 16:28:18 1.180 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.150 2001/11/01 16:34:21 tv Exp $ +# $NetBSD: Makefile,v 1.180 2002/06/26 16:28:18 drochner 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: @@ -44,9 +42,9 @@ # Runs the regression tests in "regress" on this host. # # Targets invoked by `make build,' in order: -# obj: creates object directories. # cleandir: cleans the tree. -# do-make-tools: builds host toolchain. +# obj: creates object directories. +# do-tools: builds host toolchain. # do-distrib-dirs: creates the distribution directories. # includes: installs include files. # do-lib-csu: builds and installs prerequisites from lib/csu. @@ -58,6 +56,12 @@ .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,17 +77,13 @@ .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 sys etc distrib regress # Weed out directories that don't exist. .for dir in ${_SUBDIR} -.if exists(${dir}/Makefile) +.if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no") SUBDIR+= ${dir} .endif .endfor @@ -91,25 +91,46 @@ SUBDIR+= ${dir} .if exists(regress) regression-tests: @echo Running regression tests... - @cd ${.CURDIR}/regress && ${MAKE} regress + @(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 + (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". -.if ${MKOBJDIRS} != "no" -BUILDTARGETS+= obj -.endif +BUILDTARGETS+= check-tools .if !defined(UPDATE) && !defined(NOCLEANDIR) BUILDTARGETS+= cleandir .endif +.if ${MKOBJDIRS} != "no" +BUILDTARGETS+= obj +.endif .if ${USETOOLS} == "yes" -BUILDTARGETS+= do-make-tools +BUILDTARGETS+= do-tools .endif .if !defined(NODISTRIBDIRS) BUILDTARGETS+= do-distrib-dirs @@ -131,51 +152,74 @@ 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} - ${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: + (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build) + (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution) + # Build a release or snapshot (implies "make build"). -release snapshot: build - cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release +release snapshot: + (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build) + (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) # Special components of the "make build" process. -do-make-tools: - cd ${.CURDIR}/tools && ${MAKE} build +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!' +.endif +.if defined(NBUILDJOBS) + @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!' +.endif do-distrib-dirs: .if !defined(DESTDIR) || ${DESTDIR} == "" - cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs + (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) .else - cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs + (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs) .endif -.for dir in lib/csu lib gnu/lib +.for dir in tools lib/csu lib gnu/lib do-${dir:S/\//-/}: .for targ in dependall install - cd ${.CURDIR}/${dir} && \ - ${MAKE} ${_J} MKSHARE=no MKLINT=no ${targ} + (cd ${.CURDIR}/${dir} && ${MAKE} ${targ}) .endfor .endfor do-build: - ${MAKE} ${_J} dependall - ${MAKE} ${_J} install +.for targ in dependall install + (cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no) +.endfor # Speedup stubs for some subtrees that don't need to run these rules. # (Tells not to recurse for them.) -includes-bin includes-games includes-libexec includes-regress \ -includes-sbin includes-usr.sbin includes-tools \ -dependall-tools depend-tools all-tools install-tools install-regress \ -dependall-distrib depend-distrib all-distrib install-distrib includes-distrib: +.for dir in bin etc distrib games libexec regress sbin usr.sbin tools +includes-${dir}: + @true +.endfor +.for dir in etc distrib regress +install-${dir}: + @true +.endfor + +# XXX this needs to change when distrib Makefiles are recursion compliant +dependall-distrib depend-distrib all-distrib: @true +.include .include build-docs: ${.CURDIR}/BUILDING