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.140 retrieving revision 1.156 diff -u -p -r1.140 -r1.156 --- src/Makefile 2001/10/21 08:03:01 1.140 +++ src/Makefile 2001/11/15 19:32:19 1.156 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.140 2001/10/21 08:03:01 jmc Exp $ +# $NetBSD: Makefile,v 1.156 2001/11/15 19:32:19 tv 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 @@ -44,14 +44,21 @@ # 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. +# do-lib: builds and installs prerequisites from lib. +# do-gnu-lib: builds and installs prerequisites from gnu/lib. # do-build: builds and installs the entire system. -.include "${.CURDIR}/share/mk/bsd.own.mk" +.if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == "" +.MAKEFLAGS: -m ${.CURDIR}/share/mk +.endif + +.include # Sanity check: make sure that "make build" is not invoked simultaneously # with a standard recursive target. @@ -70,25 +77,13 @@ _J= -j${NBUILDJOBS} .endif -.if ${USETOOLS} == "yes" -_SUBDIR+= tools -.endif -# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW - -_SUBDIR+= lib include gnu bin games libexec sbin usr.bin \ - usr.sbin share sys regress - -.if make(cleandir) || make(obj) -_SUBDIR+= distrib -.ifdef MAKEOBJDIRPREFIX -_SUBDIR+= etc -.endif -.endif +_SUBDIR= tools lib include gnu bin games libexec sbin usr.bin \ + 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 @@ -96,25 +91,26 @@ SUBDIR+= ${dir} .if exists(regress) regression-tests: @echo Running regression tests... - @cd ${.CURDIR}/regress && ${MAKE} ${_M} regress + @(cd ${.CURDIR}/regress && ${MAKE} regress) .endif .if ${MKMAN} != "no" afterinstall: whatis.db whatis.db: - cd ${.CURDIR}/share/man && ${MAKE} ${_M} makedb + (cd ${.CURDIR}/share/man && ${MAKE} makedb) .endif # Targets (in order!) called by "make build". -.if ${MKOBJDIRS:Uno} != "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 @@ -122,7 +118,7 @@ BUILDTARGETS+= do-distrib-dirs .if !defined(NOINCLUDES) BUILDTARGETS+= includes .endif -BUILDTARGETS+= do-build +BUILDTARGETS+= do-lib-csu do-lib do-gnu-lib do-build # Enforce proper ordering of some rules. @@ -137,41 +133,64 @@ build: @echo "Build already installed into ${DESTDIR}" .else @echo -n "Build started at: " && date - @${MAKE} ${_J} ${_M} ${BUILDTARGETS} +.for tgt in ${BUILDTARGETS} + @(cd ${.CURDIR} && ${MAKE} ${_J} ${tgt}) +.endfor @echo -n "Build finished at: " && date .endif # Build a release or snapshot (implies "make build"). release snapshot: build - cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release + (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) # Special components of the "make build" process. -do-make-tools: - cd ${.CURDIR}/tools && ${MAKE} ${_M} 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 do-distrib-dirs: - cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=${DESTDIR} distrib-dirs +.if !defined(DESTDIR) || ${DESTDIR} == "" + (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) +.else + (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs) +.endif -do-build: -.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} ${_M} ${_J} MKSHARE=no MKLINT=no ${targ} + (cd ${.CURDIR}/${dir} && ${MAKE} ${_J} ${targ}) +.endfor .endfor + +do-build: +.for targ in dependall install + (cd ${.CURDIR} && ${MAKE} ${_J} ${targ} BUILD_tools=no BUILD_lib=no) .endfor - ${MAKE} ${_M} ${_J} dependall - ${MAKE} ${_M} ${_J} install # 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: +.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 "${.CURDIR}/share/mk/bsd.subdir.mk" +.include +.include -_M:= -m ${.CURDIR}/share/mk +build-docs: ${.CURDIR}/BUILDING +${.CURDIR}/BUILDING: BUILDING.mdoc + groff -mdoc -Tascii -P-b -P-u -P-o $> >$@