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.205 retrieving revision 1.240 diff -u -p -r1.205 -r1.240 --- src/Makefile 2003/04/18 19:14:39 1.205 +++ src/Makefile 2005/08/25 02:04:39 1.240 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.205 2003/04/18 19:14:39 thorpej Exp $ +# $NetBSD: Makefile,v 1.240 2005/08/25 02:04:39 lukem 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 -# information, see http://www.netbsd.org/developers/releng/index.html +# information, see http://www.NetBSD.org/developers/releng/index.html # # Not everything you can set or do is documented in this makefile. In # particular, you should review the files in /usr/share/mk (especially @@ -19,18 +19,21 @@ # 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 +# MKMAN, if `no', will prevent building of manual pages. +# MKOBJDIRS, if not `no', will build object directories at # an appropriate point in a build. -# MKSHARE, if set to `no', will prevent building and installing +# MKSHARE, if `no', will prevent building and installing # anything in /usr/share. -# UPDATE, if defined, will avoid a `make cleandir' at the start of +# MKUPDATE, if not `no', 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, if defined, will avoid a `make cleandir' at the start # of the `make build'. # NOINCLUDES will avoid the `make includes' usually done by `make build'. # +# See mk.conf(5) for more details. +# +# # Targets: # build: # Builds a full release of NetBSD in DESTDIR, except for the @@ -47,26 +50,35 @@ # defaults to the root directory). Ensures that INSTALLWORLDDIR # is the not root directory if cross compiling. # release: -# Does a `make build', and then tars up the DESTDIR files +# Does a `make distribution', and then tars up the DESTDIR files # into RELEASEDIR/${MACHINE}, in release(7) format. # (See etc/Makefile for more information on this.) # regression-tests: # Runs the regression tests in "regress" on this host. +# sets: +# Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR} +# sourcesets: +# Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR} # # Targets invoked by `make build,' in order: # cleandir: cleans the tree. # obj: creates object directories. # do-tools: builds host toolchain. -# do-tools-compat: builds the "libnbcompat" library; needed for some -# random host tool programs in the source tree. # do-distrib-dirs: creates the distribution directories. # includes: installs include files. +# do-tools-compat: builds the "libnbcompat" library; needed for some +# random host tool programs in the source tree. # do-lib-csu: builds and installs prerequisites from lib/csu. +# do-gnu-lib-crtstuff3: builds and installs prerequisites from +# gnu/lib/crtstuff3 +# do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3 # do-lib-libc: builds and installs prerequisites from lib/libc. # do-lib: builds and installs prerequisites from lib. # do-gnu-lib: builds and installs prerequisites from gnu/lib. # do-ld.so: builds and installs prerequisites from libexec/ld.*_so. # do-build: builds and installs the entire system. +# do-x11: builds and installs X11R6 from src/x11 if ${MKX11} != "no" +# do-obsolete: installs the obsolete sets (for the postinstall-* targets). # .if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == "" @@ -112,43 +124,55 @@ SUBDIR+= ${dir} .endfor .if exists(regress) -regression-tests: +regression-tests: .PHONY @echo Running regression tests... - @(cd ${.CURDIR}/regress && ${MAKE} regress) + ${MAKEDIRTARGET} regress regress .endif -.if defined(UNPRIVED) +.if ${MKUNPRIVED} != "no" NOPOSTINSTALL= # defined .endif -afterinstall: +afterinstall: .PHONY .if ${MKMAN} != "no" - (cd ${.CURDIR}/share/man && ${MAKE} makedb) + ${MAKEDIRTARGET} share/man makedb .endif -.if defined(UNPRIVED) && (${MKINFO} != "no") - (cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta) +.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no") + ${MAKEDIRTARGET} gnu/usr.bin/texinfo/install-info infodir-meta .endif .if !defined(NOPOSTINSTALL) - (cd ${.CURDIR} && ${MAKE} postinstall-check) + ${MAKEDIRTARGET} . postinstall-check .endif -postinstall-check: +_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall + +postinstall-check: .PHONY @echo " === Post installation checks ===" - sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check + ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check @echo " ================================" -postinstall-fix: .NOTMAIN +postinstall-fix: .NOTMAIN .PHONY @echo " === Post installation fixes ===" - sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix - @echo " ================================" + ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix + @echo " ===============================" + +postinstall-fix-obsolete: .NOTMAIN .PHONY + @echo " === Removing obsolete files ===" + ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete + @echo " ===============================" # # Targets (in order!) called by "make build". # +.if ${USE_TOOLS_TOOLCHAIN} == "no" +LIBGCC_EXT=3 +.else +LIBGCC_EXT= +.endif BUILDTARGETS+= check-tools -.if !defined(UPDATE) && !defined(NOCLEANDIR) +.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR) BUILDTARGETS+= cleandir .endif .if ${MKOBJDIRS} != "no" @@ -164,7 +188,20 @@ BUILDTARGETS+= do-distrib-dirs BUILDTARGETS+= includes .endif BUILDTARGETS+= do-tools-compat -BUILDTARGETS+= do-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.so do-build +BUILDTARGETS+= do-lib-csu +.if ${MKGCC} != "no" +.if ${HAVE_GCC3} != "no" +BUILDTARGETS+= do-gnu-lib-crtstuff${LIBGCC_EXT} +.endif +BUILDTARGETS+= do-gnu-lib-libgcc${LIBGCC_EXT} +.endif +BUILDTARGETS+= do-lib-libc +BUILDTARGETS+= do-lib do-gnu-lib +BUILDTARGETS+= do-ld.so +BUILDTARGETS+= do-build +.if ${MKX11} != "no" +BUILDTARGETS+= do-x11 +.endif BUILDTARGETS+= do-obsolete # @@ -172,8 +209,8 @@ BUILDTARGETS+= do-obsolete # .ORDER: ${BUILDTARGETS} -includes-lib: includes-include includes-sys -includes-gnu: includes-lib +includes-lib: .PHONY includes-include includes-sys +includes-gnu: .PHONY includes-lib # # Build the system and install into DESTDIR. @@ -181,14 +218,15 @@ includes-gnu: includes-lib START_TIME!= date -build: +build: .PHONY .if defined(BUILD_DONE) @echo "Build already installed into ${DESTDIR}" .else @echo "Build started at: ${START_TIME}" .for tgt in ${BUILDTARGETS} - @(cd ${.CURDIR} && ${MAKE} ${tgt}) + ${MAKEDIRTARGET} . ${tgt} .endfor + ${MAKEDIRTARGET} etc install-etc-release @echo "Build started at: ${START_TIME}" @printf "Build finished at: " && date .endif @@ -198,16 +236,17 @@ build: # ${RELEASEDIR}). "buildworld" enforces a build to ${DESTDIR} != / # -distribution buildworld: +distribution buildworld: .PHONY .if make(buildworld) && \ (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/") @echo "Won't make ${.TARGET} with DESTDIR=/" @false .endif - (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build) - (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution) + ${MAKEDIRTARGET} . build NOPOSTINSTALL=1 + ${MAKEDIRTARGET} etc distribution INSTALL_DONE=1 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/" - (cd ${.CURDIR}/distrib/sets && ${MAKE} checkflist) + ${MAKEDIRTARGET} . postinstall-fix-obsolete + ${MAKEDIRTARGET} distrib/sets checkflist .endif @echo "make ${.TARGET} started at: ${START_TIME}" @printf "make ${.TARGET} finished at: " && date @@ -221,7 +260,7 @@ distribution buildworld: HOST_UNAME_S!= uname -s HOST_UNAME_M!= uname -m -installworld: +installworld: .PHONY .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/") @echo "Can't make ${.TARGET} to DESTDIR=/" @false @@ -237,29 +276,30 @@ installworld: @false .endif .endif - (cd ${.CURDIR}/distrib/sets && \ - ${MAKE} INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS= installsets) - (cd ${.CURDIR} && \ - ${MAKE} DESTDIR=${INSTALLWORLDDIR} postinstall-check) + ${MAKEDIRTARGET} distrib/sets installsets \ + INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS= + ${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR} @echo "make ${.TARGET} started at: ${START_TIME}" @printf "make ${.TARGET} finished at: " && date # -# Create sets from $DESTDIR into $RELEASEDIR +# Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR # -sets: - (cd ${.CURDIR}/distrib/sets && ${MAKE} maketars) +.for tgt in sets sourcesets +${tgt}: .PHONY + ${MAKEDIRTARGET} distrib/sets ${tgt} +.endfor # -# Build a release or snapshot (implies "make build"). Note that +# Build a release or snapshot (implies "make distribution"). Note that # in this case, the set lists will be checked before the tar files # are made. # -release snapshot: - (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build) - (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) +release snapshot: .PHONY + ${MAKEDIRTARGET} . distribution + ${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1 @echo "make ${.TARGET} started at: ${START_TIME}" @printf "make ${.TARGET} finished at: " && date @@ -267,8 +307,8 @@ release snapshot: # Special components of the "make build" process. # -check-tools: -.if ${TOOLCHAIN_MISSING} == "yes" && !defined(EXTERNAL_TOOLCHAIN) +check-tools: .PHONY +.if ${TOOLCHAIN_MISSING} != "no" && !defined(EXTERNAL_TOOLCHAIN) @echo '*** WARNING: Building on MACHINE=${MACHINE} with missing toolchain.' @echo '*** May result in a failed build or corrupt binaries!' .elif defined(EXTERNAL_TOOLCHAIN) @@ -278,42 +318,45 @@ check-tools: @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!' .endif -do-distrib-dirs: +do-distrib-dirs: .PHONY .if !defined(DESTDIR) || ${DESTDIR} == "" - (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) + ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/ .else - (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs) + ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=${DESTDIR} .endif .for targ in cleandir obj includes -do-${targ}: ${targ} +do-${targ}: .PHONY ${targ} @true .endfor -.for dir in tools tools/compat lib/csu lib/libc lib gnu/lib -do-${dir:S/\//-/}: +.for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib +do-${dir:S/\//-/g}: .PHONY .for targ in dependall install - (cd ${.CURDIR}/${dir} && ${MAKE} ${targ}) + ${MAKEDIRTARGET} ${dir} ${targ} .endfor .endfor -do-ld.so: +do-ld.so: .PHONY .for targ in dependall install .if (${OBJECT_FMT} == "a.out") - (cd ${.CURDIR}/libexec/ld.aout_so && ${MAKE} ${targ}) + ${MAKEDIRTARGET} libexec/ld.aout_so ${targ} .endif .if (${OBJECT_FMT} == "ELF") - (cd ${.CURDIR}/libexec/ld.elf_so && ${MAKE} ${targ}) + ${MAKEDIRTARGET} libexec/ld.elf_so ${targ} .endif .endfor -do-build: +do-build: .PHONY .for targ in dependall install - (cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no) + ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no .endfor -do-obsolete: - (cd ${.CURDIR}/etc && ${MAKE} install-obsolete-lists) +do-x11: .PHONY + ${MAKEDIRTARGET} x11 build + +do-obsolete: .PHONY + ${MAKEDIRTARGET} etc install-obsolete-lists # # Speedup stubs for some subtrees that don't need to run these rules. @@ -321,11 +364,11 @@ do-obsolete: # .for dir in bin etc distrib games libexec regress sbin usr.sbin tools -includes-${dir}: +includes-${dir}: .PHONY @true .endfor .for dir in etc distrib regress -install-${dir}: +install-${dir}: .PHONY @true .endfor @@ -333,12 +376,22 @@ install-${dir}: # XXX this needs to change when distrib Makefiles are recursion compliant # XXX many distrib subdirs need "cd etc && make snap_pre snap_kern" first... # -dependall-distrib depend-distrib all-distrib: +dependall-distrib depend-distrib all-distrib: .PHONY @true +.include .include +.include .include -build-docs: ${.CURDIR}/BUILDING +build-docs: .PHONY ${.CURDIR}/BUILDING ${.CURDIR}/BUILDING: doc/BUILDING.mdoc - groff -mdoc -Tascii -P-b -P-u -P-o $> >$@ + ${_MKMSG_CREATE} ${.TARGET} + ${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@ + + +# +# Display current make(1) parameters +# +params: .PHONY + ${MAKEDIRTARGET} etc params