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.246.2.3.2.1
retrieving revision 1.256
diff -u -p -r1.246.2.3.2.1 -r1.256
--- src/Makefile	2009/06/05 17:01:43	1.246.2.3.2.1
+++ src/Makefile	2008/08/24 05:56:20	1.256
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.246.2.3.2.1 2009/06/05 17:01:43 snj Exp $
+#	$NetBSD: Makefile,v 1.256 2008/08/24 05:56:20 gmcgarry Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -51,16 +51,18 @@
 #	is the not root directory if cross compiling.
 #   release:
 #	Does a `make distribution', and then tars up the DESTDIR files
-#	into RELEASEDIR/${MACHINE}, in release(7) format.
+#	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}/${MACHINE}/binary/syspkgs from ${DESTDIR}
+#	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'
@@ -79,12 +81,16 @@
 #   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-libgcc:       builds and installs prerequisites from
+#                    gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
+#                    gnu/lib/libgcc${LIBGCC_EXT}.
+#   do-libpcc:       builds and install prerequisites from
+#                    external/bsd/pcc/crtstuff and external/bsd/pcc/libpcc.
 #   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-external-lib: builds and installs prerequisites from external/lib.
+#   do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/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"
@@ -121,7 +127,7 @@ _SRC_TOP_OBJ_=
 .endif
 
 _SUBDIR=	tools lib include gnu external bin games libexec sbin usr.bin
-_SUBDIR+=	usr.sbin share rescue sys etc .WAIT distrib regress
+_SUBDIR+=	usr.sbin share rescue sys etc tests .WAIT distrib regress
 
 #
 # Weed out directories that don't exist.
@@ -175,11 +181,13 @@ postinstall-fix-obsolete: .NOTMAIN .PHON
 #
 # Targets (in order!) called by "make build".
 #
+.if defined(HAVE_GCC)
 .if ${HAVE_GCC} == "3"
 LIBGCC_EXT=3
 .else
 LIBGCC_EXT=4
 .endif
+.endif
 
 BUILDTARGETS+=	check-tools
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
@@ -200,13 +208,14 @@ BUILDTARGETS+=	includes
 BUILDTARGETS+=	do-tools-compat
 BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
-.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
-BUILDTARGETS+=	do-gnu-lib-crtstuff${LIBGCC_EXT}
+BUILDTARGETS+=	do-libgcc
 .endif
-BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}
+.if ${MKPCC} != "no"
+BUILDTARGET+=	do-libpcc
 .endif
 BUILDTARGETS+=	do-lib-libc
 BUILDTARGETS+=	do-lib do-gnu-lib do-external-lib
+BUILDTARGETS+=	do-sys-rump-fs-lib
 BUILDTARGETS+=	do-ld.so
 BUILDTARGETS+=	do-build
 .if ${MKX11} != "no"
@@ -356,13 +365,39 @@ 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 external/lib
+.if defined(HAVE_GCC)
+BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
+BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}
+.elif defined(HAVE_PCC)
+BUILD_CC_LIB+= external/bsd/pcc/crtstuff
+BUILD_CC_LIB+= external/bsd/pcc/libpcc
+.endif
+
+.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib sys/rump/fs/lib
 do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} ${dir} ${targ}
 .endfor
 .endfor
 
+do-libgcc: .PHONY .MAKE
+.if defined(HAVE_GCC)
+.if ${MKGCC} != "no"
+.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
+	${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
+.endif
+	${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
+.endif
+.endif
+
+do-libpcc: .PHONY .MAKE
+.if defined(HAVE_PCC)
+.if ${MKPCC} != "no"
+	${MAKEDIRTARGET} . do-pcc-lib-crtstuff
+	${MAKEDIRTARGET} . do-pcc-lib-libpcc
+.endif
+.endif
+
 do-ld.so: .PHONY .MAKE
 .for targ in dependall install
 .if (${OBJECT_FMT} == "a.out")
@@ -379,7 +414,11 @@ do-build: .PHONY .MAKE
 .endfor
 
 do-x11: .PHONY .MAKE
+.if ${MKXORG} != "no"
+	${MAKEDIRTARGET} external/mit/xorg build
+.else
 	${MAKEDIRTARGET} x11 build
+.endif
 
 do-obsolete: .PHONY .MAKE
 	${MAKEDIRTARGET} etc install-obsolete-lists