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.238
retrieving revision 1.300
diff -u -p -r1.238 -r1.300
--- src/Makefile	2005/01/01 10:32:39	1.238
+++ src/Makefile	2012/11/04 11:02:11	1.300
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.238 2005/01/01 10:32:39 lukem Exp $
+#	$NetBSD: Makefile,v 1.300 2012/11/04 11:02:11 apb Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -48,36 +48,61 @@
 #   installworld:
 #	Install the distribution from DESTDIR to INSTALLWORLDDIR (which
 #	defaults to the root directory).  Ensures that INSTALLWORLDDIR
-#	is the not root directory if cross compiling.
+#	is not the root directory if cross compiling.
 #   release:
-#	Does a `make build', and then tars up the DESTDIR files
-#	into RELEASEDIR/${MACHINE}, in release(7) format.
+#	Does a `make distribution', and then tars up the DESTDIR files
+#	into ${RELEASEDIR}/${RELEASEMACHINEDIR}, 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}
+#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
+#	from ${DESTDIR}
 #   sourcesets:
 #	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
+#   syspkgs:
+#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
+#	from ${DESTDIR}
+#   iso-image:
+#	Create CD-ROM image in RELEASEDIR/iso.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
+#   iso-image-source:
+#	Create CD-ROM image with source in RELEASEDIR/iso.
+#	RELEASEDIR must already have been populated by
+#	`make release sourcesets' or equivalent.
+#   live-image:
+#	Create bootable live image for emulators or USB stick etc.
+#	in RELEASEDIR/liveimage.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
+#   install-image:
+#	Create bootable installation image for USB stick etc.
+#	in RELEASEDIR/installimage.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
 #
 # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.
-#   obj:             creates object directories.
+#   do-top-obj:      creates the top level object directory.
+#   do-tools-obj:    creates object directories for the host toolchain.
 #   do-tools:        builds host toolchain.
+#   params:          record the values of variables that might affect the
+#                    build.
+#   obj:             creates object directories.
 #   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-lib:          builds and installs prerequisites from lib
+#                    if ${MKCOMPAT} != "no".
+#   do-compat-lib:   builds and installs prerequisites from compat/lib
+#                    if ${MKCOMPAT} != "no".
 #   do-build:        builds and installs the entire system.
-#   do-x11:          builds and installs X11R6 from src/x11 if ${MKX11} != "no"
+#   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
+#                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
+#                    or X11R6 from src/x11
+#   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #
 
@@ -110,21 +135,23 @@ _SRC_TOP_OBJ_=
 .endfor
 .endif
 
-_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
-_SUBDIR+=	usr.sbin share rescue sys etc .WAIT distrib regress
-
 #
-# Weed out directories that don't exist.
+# _SUBDIR is used to set SUBDIR, after removing directories that have
+# BUILD_${dir}=no, or that have no ${dir}/Makefile.
 #
+_SUBDIR=	tools lib include gnu external crypto/external bin games
+_SUBDIR+=	libexec sbin usr.bin
+_SUBDIR+=	usr.sbin share rescue sys etc tests compat .WAIT distrib regress
 
 .for dir in ${_SUBDIR}
-.if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
+.if "${dir}" == ".WAIT" \
+	|| (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile))
 SUBDIR+=	${dir}
 .endif
 .endfor
 
 .if exists(regress)
-regression-tests: .PHONY
+regression-tests: .PHONY .MAKE
 	@echo Running regression tests...
 	${MAKEDIRTARGET} regress regress
 .endif
@@ -133,7 +160,7 @@ regression-tests: .PHONY
 NOPOSTINSTALL=	# defined
 .endif
 
-afterinstall: .PHONY
+afterinstall: .PHONY .MAKE
 .if ${MKMAN} != "no"
 	${MAKEDIRTARGET} share/man makedb
 .endif
@@ -144,29 +171,44 @@ afterinstall: .PHONY
 	${MAKEDIRTARGET} . postinstall-check
 .endif
 
+_POSTINSTALL=	${.CURDIR}/usr.sbin/postinstall/postinstall
+_POSTINSTALL_ENV= \
+	AWK=${TOOL_AWK:Q}		\
+	DB=${TOOL_DB:Q}			\
+	HOST_SH=${HOST_SH:Q}		\
+	MAKE=${MAKE:Q}			\
+	PWD_MKDB=${TOOL_PWD_MKDB:Q}	\
+	STAT=${TOOL_STAT:Q}
+
 postinstall-check: .PHONY
 	@echo "   === Post installation checks ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
+	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
 	@echo "   ================================"
 
 postinstall-fix: .NOTMAIN .PHONY
 	@echo "   === Post installation fixes ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
+	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
 	@echo "   ==============================="
 
 postinstall-fix-obsolete: .NOTMAIN .PHONY
 	@echo "   === Removing obsolete files ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
+	${_POSTINSTALL_ENV} ${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
+.if defined(HAVE_GCC)
+.if ${HAVE_GCC} == "4"
+LIBGCC_EXT=4
+BUILD_CC_LIB_BASEDIR= gnu/lib
+BUILD_CC_LIB_BASETARGET= gnu-lib
 .else
 LIBGCC_EXT=
+BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
+BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
+.endif
 .endif
 
 BUILDTARGETS+=	check-tools
@@ -174,32 +216,34 @@ BUILDTARGETS+=	check-tools
 BUILDTARGETS+=	cleandir
 .endif
 .if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=	obj
+BUILDTARGETS+=	do-top-obj
+.endif
+.if ${USETOOLS} == "yes"	# {
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	do-tools-obj
 .endif
-.if ${USETOOLS} == "yes"
 BUILDTARGETS+=	do-tools
+.endif # USETOOLS		# }
+BUILDTARGETS+=	params
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	obj
 .endif
+BUILDTARGETS+=	clean_METALOG
 .if !defined(NODISTRIBDIRS)
 BUILDTARGETS+=	do-distrib-dirs
 .endif
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
-BUILDTARGETS+=	do-tools-compat
-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-lib
+BUILDTARGETS+=	do-compat-lib
 BUILDTARGETS+=	do-build
 .if ${MKX11} != "no"
 BUILDTARGETS+=	do-x11
 .endif
+.if ${MKEXTSRC} != "no"
+BUILDTARGETS+=	do-extsrc
+.endif
 BUILDTARGETS+=	do-obsolete
 
 #
@@ -211,12 +255,32 @@ includes-lib:	.PHONY includes-include in
 includes-gnu:	.PHONY includes-lib
 
 #
+# Record the values of variables that might affect the build.
+# If no values have changed, avoid updating the timestamp
+# of the params file.
+#
+# This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.
+#
+
+CLEANDIRFILES+= params
+params: .EXEC
+	${_MKMSG_CREATE} params
+	@(${MAKEDIRTARGET:S/^@//} etc params) >${.TARGET}.new
+	@if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \
+		: "params is unchanged" ; \
+		rm ${.TARGET}.new ; \
+	else \
+		: "params has changed or is new" ; \
+		mv ${.TARGET}.new ${.TARGET} ; \
+	fi
+
+#
 # Build the system and install into DESTDIR.
 #
 
 START_TIME!=	date
 
-build: .PHONY
+build: .PHONY .MAKE
 .if defined(BUILD_DONE)
 	@echo "Build already installed into ${DESTDIR}"
 .else
@@ -234,7 +298,7 @@ build: .PHONY
 # ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
 #
 
-distribution buildworld: .PHONY
+distribution buildworld: .PHONY .MAKE
 .if make(buildworld) && \
     (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
 	@echo "Won't make ${.TARGET} with DESTDIR=/"
@@ -258,7 +322,7 @@ distribution buildworld: .PHONY
 HOST_UNAME_S!=	uname -s
 HOST_UNAME_M!=	uname -m
 
-installworld: .PHONY
+installworld: .PHONY .MAKE
 .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
 	@echo "Can't make ${.TARGET} to DESTDIR=/"
 	@false
@@ -275,29 +339,86 @@ installworld: .PHONY
 .endif
 .endif
 	${MAKEDIRTARGET} distrib/sets installsets \
-	    INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=
+		INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=${INSTALLSETS:Q}
 	${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
 #
+# Install modules from $DESTDIR to $INSTALLMODULESDIR
+#
+installmodules: .PHONY .MAKE
+.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Can't make ${.TARGET} to DESTDIR=/"
+	@false
+.endif
+.if !defined(INSTALLMODULESDIR) || \
+    ${INSTALLMODULESDIR} == "" || ${INSTALLMODULESDIR} == "/"
+.if (${HOST_UNAME_S} != "NetBSD")
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLMODULESDIR=/"
+	@false
+.endif
+.if (${HOST_UNAME_M} != ${MACHINE})
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLMODULESDIR=/"
+	@false
+.endif
+.endif
+	${MAKEDIRTARGET} sys/modules install DESTDIR=${INSTALLMODULESDIR:U/}
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
 # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
 #
 
-.for tgt in sets sourcesets
-${tgt}: .PHONY
+.for tgt in sets sourcesets syspkgs
+${tgt}: .PHONY .MAKE
 	${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: .PHONY
-	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
-	${MAKEDIRTARGET} etc release INSTALL_DONE=1
+release snapshot: .PHONY .MAKE
+	${MAKEDIRTARGET} . distribution
+	${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create a CD-ROM image.
+#
+
+iso-image: .PHONY
+	${MAKEDIRTARGET} distrib iso_image
+	${MAKEDIRTARGET} etc iso-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+iso-image-source: .PHONY
+	${MAKEDIRTARGET} distrib iso_image CDSOURCE=true
+	${MAKEDIRTARGET} etc iso-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create bootable live images.
+#
+
+live-image: .PHONY
+	${MAKEDIRTARGET} etc live-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create bootable installation images.
+#
+
+install-image: .PHONY
+	${MAKEDIRTARGET} etc install-image
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
@@ -316,7 +437,13 @@ check-tools: .PHONY
 	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif
 
-do-distrib-dirs: .PHONY
+# Delete or sanitise a leftover METALOG from a previous build.
+clean_METALOG: .PHONY .MAKE
+.if ${MKUPDATE} != "no"
+	${MAKEDIRTARGET} distrib/sets clean_METALOG
+.endif
+
+do-distrib-dirs: .PHONY .MAKE
 .if !defined(DESTDIR) || ${DESTDIR} == ""
 	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
 .else
@@ -328,32 +455,51 @@ do-${targ}: .PHONY ${targ}
 	@true
 .endfor
 
-.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 dir in tools tools/compat
+do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} ${dir} ${targ}
 .endfor
 .endfor
 
-do-ld.so: .PHONY
-.for targ in dependall install
-.if (${OBJECT_FMT} == "a.out")
-	${MAKEDIRTARGET} libexec/ld.aout_so ${targ}
-.endif
-.if (${OBJECT_FMT} == "ELF")
-	${MAKEDIRTARGET} libexec/ld.elf_so ${targ}
-.endif
-.endfor
+do-lib: .PHONY .MAKE
+	${MAKEDIRTARGET} lib build_install
+
+do-compat-lib: .PHONY .MAKE
+	${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"
+
+do-top-obj: .PHONY .MAKE
+	${MAKEDIRTARGET} . obj NOSUBDIR=
 
-do-build: .PHONY
+do-tools-obj: .PHONY .MAKE
+	${MAKEDIRTARGET} tools obj
+
+do-build: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
 .endfor
 
-do-x11: .PHONY
+do-x11: .PHONY .MAKE
+.if ${MKX11} != "no"
+.if ${X11FLAVOUR} == "Xorg"
+	${MAKEDIRTARGET} external/mit/xorg build
+.else
 	${MAKEDIRTARGET} x11 build
+.endif
+.else
+	@echo "MKX11 is not enabled"
+	@false
+.endif
 
-do-obsolete: .PHONY
+do-extsrc: .PHONY .MAKE
+.if ${MKEXTSRC} != "no"
+	${MAKEDIRTARGET} extsrc build
+.else
+	@echo "MKEXTSRC is not enabled"
+	@false
+.endif
+
+do-obsolete: .PHONY .MAKE
 	${MAKEDIRTARGET} etc install-obsolete-lists
 
 #
@@ -361,7 +507,7 @@ do-obsolete: .PHONY
 # (Tells <bsd.subdir.mk> not to recurse for them.)
 #
 
-.for dir in bin etc distrib games libexec regress sbin usr.sbin tools
+.for dir in bin etc distrib games libexec regress sbin usr.bin usr.sbin tools
 includes-${dir}: .PHONY
 	@true
 .endfor
@@ -382,14 +528,8 @@ dependall-distrib depend-distrib all-dis
 .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>
 
-build-docs: .PHONY ${.CURDIR}/BUILDING
-${.CURDIR}/BUILDING: doc/BUILDING.mdoc
-	${_MKMSG_CREATE} ${.TARGET}
-	${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@
-
-
 #
 # Display current make(1) parameters
 #
-params: .PHONY
+show-params: .PHONY .MAKE
 	${MAKEDIRTARGET} etc params