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.95.2.1 retrieving revision 1.113 diff -u -p -r1.95.2.1 -r1.113 --- src/Makefile 2000/08/26 19:00:36 1.95.2.1 +++ src/Makefile 2000/04/11 08:21:41 1.113 @@ -1,11 +1,7 @@ -# $NetBSD: Makefile,v 1.95.2.1 2000/08/26 19:00:36 he Exp $ +# $NetBSD: Makefile,v 1.113 2000/04/11 08:21:41 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 -.PHONY: release - -TARGETS+= release - # information, see http://www.netbsd.org/developers/releng/index.html # # Not everything you can set or do is documented in this makefile. In @@ -19,41 +15,54 @@ TARGETS+= release # (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. # # 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. +SRCTOP=. +.include # for configuration variables. +.if defined(CRYPTOPATH) +.sinclude "${CRYPTOPATH}/Makefile.frag" +.endif +MKOBJDIRS ?= no HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|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) +.if make(obj) SUBDIR+= distrib .endif +includes-lib: includes-include includes-sys + .if exists(games) SUBDIR+= games .endif @@ -62,23 +71,6 @@ SUBDIR+= gnu # This is needed for libstdc++ and gen-params. includes-gnu: includes-include includes-sys -# Descend into the domestic tree if it exists AND -# 1) the target is clean, cleandir, or obj, OR -# 2) the the target is install or includes AND -# NOT compiling only "exportable" code AND -# doing it as part of installing a distribution. -# -# NOTE: due to the use of the make(foo) construct here, using the -# clean, cleandir, and obj targets on the command line in conjunction -# with any other target may produce unexpected results. - -.if exists(domestic) && \ - (make(clean) || make(cleandir) || make(obj) || \ - ((make(includes) || make(install)) && \ - !defined(EXPORTABLE_SYSTEM) && defined(_DISTRIB))) -SUBDIR+= domestic -.endif - .if exists(regress) .ifmake !(install) SUBDIR+= regress @@ -86,38 +78,52 @@ 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 + +beforeinstall: +.ifndef NODISTRIBDIRS .ifndef DESTDIR (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) .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".' + @echo ' Please correct the problem and try again.' + @false +.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} ${_M} cleandir +.endif +.if ${MKOBJDIRS} != "no" + ${MAKE} obj .endif .if empty(HAVE_GCC28) .if defined(DESTDIR) @@ -127,29 +133,35 @@ 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 - ${MAKE} includes +.if !defined(NOINCLUDES) + ${MAKE} ${_M} includes +.endif (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 -.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) - (cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build) + ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \ + ${MAKE} ${_M} MKSHARE=no install) +.if target(cryptobuild) + ${MAKE} ${_M} ${_J} cryptobuild +.endif + ${MAKE} ${_M} ${_J} dependall && ${MAKE} ${_M} _BUILD= install +.if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM) + (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