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.111 retrieving revision 1.124 diff -u -p -r1.111 -r1.124 --- src/Makefile 2000/04/09 02:09:49 1.111 +++ src/Makefile 2001/06/10 13:12:32 1.124 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2000/04/09 02:09:49 simonb Exp $ +# $NetBSD: Makefile,v 1.124 2001/06/10 13:12:32 mrg 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 @@ -27,6 +27,9 @@ # 'make build'. It defaults to 1. # UPDATE will avoid a `make cleandir' at the start of `make build', # as well as having the effects listed in /usr/share/mk/bsd.README. +# NOCLEANDIR will avoid a `make cleandir' at the start of `make build', +# but without having the effects listed in /usr/share/mk/bsd.README. +# NOINCLUDES will avoid the `make includes' usually done by `make build'. # # Targets: # build: builds a full release of netbsd in DESTDIR. If BUILD_DONE is @@ -35,26 +38,45 @@ # into RELEASEDIR, in release(7) format. (See etc/Makefile for # more information on this.) # snapshot: a synonym for release. +# +# Sub targets of `make build,' in order: +# buildstartmsg: displays the start time of the build. +# beforeinstall: creates the distribution directories. +# do-force-domestic: check's that FORCE_DOMESTIC isn't set (deprecated.) +# do-share-mk: installs /usr/share/mk files. +# do-cleandir: clean's the tree. +# do-make-obj: create's object directories if required. +# do-check-egcs: check's that we have a modern enough compiler (deprecated.) +# do-make-includes: install include files. +# do-lib-csu: build & install startup object files. +# do-lib: build & install system libraries. +# do-gnu-lib: build & install gnu system libraries. +# do-dependall: builds & install the entire system. +# do-domestic: build & install the domestic tree (deprecated.) +# do-whatisdb: build & install the `whatis.db' man database. +# buildendmsg: displays the end time of the build. -SRCTOP=. -.include # for configuration variables. - -.if defined(CRYPTOPATH) -.sinclude "${CRYPTOPATH}/Makefile.frag" -.endif +.include MKOBJDIRS ?= no -HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo +HAVE_EGCS!= ${CXX} --version | egrep "^(2\.[89]|egcs)" ; echo .if defined(NBUILDJOBS) _J= -j${NBUILDJOBS} .endif +.if defined(DESTDIR) +_M=-m ${DESTDIR}/usr/share/mk +.endif + # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys -.if make(obj) +.if make(cleandir) || make(obj) SUBDIR+= distrib +.ifdef MAKEOBJDIRPREFIX +SUBDIR+= etc +.endif .endif includes-lib: includes-include includes-sys @@ -74,27 +96,41 @@ SUBDIR+= regress regression-tests: @echo Running regression tests... - @(cd ${.CURDIR}/regress && ${MAKE} regress) + @(cd ${.CURDIR}/regress && ${MAKE} ${_M} regress) .endif -buildmsg: +buildstartmsg: @echo -n "Build started at: " @date +buildendmsg: + @echo -n "Build finished at: " + @date + +# If sharesrc is around, use its share/mk files to bootstrap until the +# mk files are installed (first step of make build). If installing to +# DESTDIR, don't bother, since the build will fail later on anyway. + beforeinstall: +.ifndef NODISTRIBDIRS .ifndef DESTDIR +.if exists(share/mk) + (cd ${.CURDIR}/etc && ${MAKE} -m ${.CURDIR}/share/mk DESTDIR=/ distrib-dirs) +.else (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) +.endif .else (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs) .endif +.endif afterinstall: .if ${MKMAN} != "no" && !defined(_BUILD) - ${MAKE} whatis.db + ${MAKE} ${_M} whatis.db .endif whatis.db: - (cd ${.CURDIR}/share/man && ${MAKE} makedb) + (cd ${.CURDIR}/share/man && ${MAKE} ${_M} makedb) # wrt info/dir below: It's safe to move this over top of /usr/share/info/dir, # as the build will automatically remove/replace the non-pkg entries there. @@ -103,23 +139,49 @@ whatis.db: build: @echo "Build installed into ${DESTDIR}" .else -build: buildmsg beforeinstall +build: + @${MAKE} ${_M} buildstartmsg + @${MAKE} ${_M} beforeinstall + @${MAKE} ${_M} do-force-domestic + @${MAKE} ${_M} do-share-mk + @${MAKE} ${_M} do-cleandir + @${MAKE} ${_M} do-make-obj + @${MAKE} ${_M} do-check-egcs + @${MAKE} ${_M} do-make-includes + @${MAKE} ${_M} do-lib-csu + @${MAKE} ${_M} do-lib + @${MAKE} ${_M} do-gnu-lib + @${MAKE} ${_M} do-dependall + @${MAKE} ${_M} do-domestic + @${MAKE} ${_M} do-whatisdb + @${MAKE} ${_M} buildendmsg +.endif + +do-force-domestic: .if defined(FORCE_DOMESTIC) @echo '*** CAPUTE!' @echo ' The FORCE_DOMESTIC flag is not compatible with "make build".' @echo ' Please correct the problem and try again.' @false .endif + +do-share-mk: .if ${MKSHARE} != "no" (cd ${.CURDIR}/share/mk && ${MAKE} install) .endif -.if !defined(UPDATE) - ${MAKE} cleandir + +do-cleandir: +.if !defined(UPDATE) && !defined(NOCLEANDIR) + ${MAKE} ${_J} ${_M} cleandir .endif + +do-make-obj: .if ${MKOBJDIRS} != "no" - ${MAKE} obj + ${MAKE} ${_J} ${_M} obj .endif -.if empty(HAVE_GCC28) + +do-check-egcs: +.if empty(HAVE_EGCS) .if defined(DESTDIR) @echo "*** CAPUTE!" @echo " You attempted to compile the world without egcs. You must" @@ -127,33 +189,43 @@ build: buildmsg beforeinstall @false .else (cd ${.CURDIR}/gnu/usr.bin/egcs && \ - ${MAKE} ${_J} dependall MKMAN=no && \ - ${MAKE} MKMAN=no install && ${MAKE} cleandir) + ${MAKE} ${_M} ${_J} dependall MKMAN=no && \ + ${MAKE} ${_M} MKMAN=no install && ${MAKE} ${_M} cleandir) .endif .endif - ${MAKE} includes + +do-make-includes: +.if !defined(NOINCLUDES) + ${MAKE} ${_M} includes +.endif + +do-lib-csu: (cd ${.CURDIR}/lib/csu && \ - ${MAKE} ${_J} MKMAN=no dependall && \ - ${MAKE} MKMAN=no install) + ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \ + ${MAKE} ${_M} MKSHARE=no install) + +do-lib: (cd ${.CURDIR}/lib && \ - ${MAKE} ${_J} MKMAN=no MKINFO=no dependall && \ - ${MAKE} MKMAN=no MKINFO=no install) + ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \ + ${MAKE} ${_M} MKSHARE=no install) + +do-gnu-lib: (cd ${.CURDIR}/gnu/lib && \ - ${MAKE} ${_J} MKMAN=no MKINFO=no dependall && \ - ${MAKE} MKMAN=no MKINFO=no install) -.if target(cryptobuild) - ${MAKE} ${_J} cryptobuild -.endif - ${MAKE} ${_J} dependall && ${MAKE} _BUILD= install + ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \ + ${MAKE} ${_M} MKSHARE=no install) + +do-dependall: + ${MAKE} ${_M} ${_J} dependall && ${MAKE} ${_M} _BUILD= install + +do-domestic: .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM) - (cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_J} _SLAVE_BUILD= build) -.endif - ${MAKE} whatis.db - @echo -n "Build finished at: " - @date + (cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_M} ${_J} _SLAVE_BUILD= build) .endif +do-whatisdb: + ${MAKE} ${_M} whatis.db + release snapshot: build - (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) + (cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release) .include