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.98 retrieving revision 1.122 diff -u -p -r1.98 -r1.122 --- src/Makefile 1999/07/12 21:53:52 1.98 +++ src/Makefile 2001/05/08 02:04:08 1.122 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 1999/07/12 21:53:52 thorpej Exp $ +# $NetBSD: Makefile,v 1.122 2001/05/08 02:04:08 sommerfeld 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 @@ -15,36 +15,54 @@ # (lowest priority). # # Variables: -# NBUILDJOBS is the number of jobs to start in parallel during a -# 'make build'. It defaults to 1. +# DESTDIR is the target directory for installation of the compiled +# 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 +# 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 will avoid a `make cleandir' at the start of `make build', # as well as having the effects listed in /usr/share/mk/bsd.README. -# DESTDIR is the target directory for installation of the compiled -# software. It defaults to /. Note that programs are built against -# libraries installed in DESTDIR. +# 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. +# build: builds a full release of netbsd in DESTDIR. If BUILD_DONE is +# set, this is an empty target. # release: does a `make build,' and then tars up the DESTDIR files # into RELEASEDIR, in release(7) format. (See etc/Makefile for # more information on this.) # snapshot: a synonym for release. -.include # for configuration variables. +.include - -HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo +MKOBJDIRS ?= no +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(cleandir) || make(obj) +SUBDIR+= distrib +.ifdef MAKEOBJDIRPREFIX +SUBDIR+= etc +.endif +.endif + +includes-lib: includes-include includes-sys .if exists(games) SUBDIR+= games @@ -61,32 +79,46 @@ SUBDIR+= regress regression-tests: @echo Running regression tests... - @(cd ${.CURDIR}/regress && ${MAKE} regress) + @(cd ${.CURDIR}/regress && ${MAKE} ${_M} regress) .endif -beforeinstall: -.ifmake build +buildmsg: @echo -n "Build started at: " @date -.endif + +# 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. -build: beforeinstall +.if defined(BUILD_DONE) +build: + @echo "Build installed into ${DESTDIR}" +.else +build: buildmsg beforeinstall .if defined(FORCE_DOMESTIC) @echo '*** CAPUTE!' @echo ' The FORCE_DOMESTIC flag is not compatible with "make build".' @@ -95,12 +127,14 @@ build: beforeinstall .endif .if ${MKSHARE} != "no" (cd ${.CURDIR}/share/mk && ${MAKE} install) - (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install) .endif -.if !defined(UPDATE) - ${MAKE} cleandir +.if !defined(UPDATE) && !defined(NOCLEANDIR) + ${MAKE} ${_J} ${_M} cleandir .endif -.if empty(HAVE_GCC28) +.if ${MKOBJDIRS} != "no" + ${MAKE} ${_J} ${_M} obj +.endif +.if empty(HAVE_EGCS) .if defined(DESTDIR) @echo "*** CAPUTE!" @echo " You attempted to compile the world without egcs. You must" @@ -108,29 +142,32 @@ build: beforeinstall @false .else (cd ${.CURDIR}/gnu/usr.bin/egcs && \ - ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ - ${MAKE} MKMAN=no install && ${MAKE} cleandir) + ${MAKE} ${_M} ${_J} dependall MKMAN=no && \ + ${MAKE} ${_M} MKMAN=no install && ${MAKE} ${_M} cleandir) +.endif .endif +.if !defined(NOINCLUDES) + ${MAKE} ${_M} includes .endif - ${MAKE} includes (cd ${.CURDIR}/lib/csu && \ - ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ - ${MAKE} MKMAN=no install) + ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \ + ${MAKE} ${_M} MKSHARE=no install) (cd ${.CURDIR}/lib && \ - ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ - ${MAKE} MKMAN=no install) + ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \ + ${MAKE} ${_M} MKSHARE=no install) (cd ${.CURDIR}/gnu/lib && \ - ${MAKE} depend && ${MAKE} ${_J} MKMAN=no MKINFO=no && \ - ${MAKE} MKMAN=no MKINFO=no install) - ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install + ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \ + ${MAKE} ${_M} MKSHARE=no install) + ${MAKE} ${_M} ${_J} dependall && ${MAKE} ${_M} _BUILD= install .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM) - (cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_J} _SLAVE_BUILD= build) + (cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_M} ${_J} _SLAVE_BUILD= build) .endif - ${MAKE} whatis.db + ${MAKE} ${_M} whatis.db @echo -n "Build finished at: " @date +.endif release snapshot: build - (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) + (cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release) .include