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.252.4.1
retrieving revision 1.260
diff -u -p -r1.252.4.1 -r1.260
--- src/Makefile	2008/06/23 04:26:43	1.252.4.1
+++ src/Makefile	2008/10/22 17:37:16	1.260
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.252.4.1 2008/06/23 04:26:43 wrstuden Exp $
+#	$NetBSD: Makefile,v 1.260 2008/10/22 17:37:16 apb Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -74,8 +74,9 @@
 #
 # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.
-#   obj:             creates object directories.
+#   do-tools-obj:    creates object directories for the host toolchain.
 #   do-tools:        builds host toolchain.
+#   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
@@ -84,13 +85,19 @@
 #   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-sys-rump-net-lib: builds and installs prerequisites from sys/rump/net/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-x11:          builds and installs X11; either
+#                    X11R7 from src/external/mit/xorg if ${MKXORG} != "no"
+#                    or X11R6 from src/x11 if ${MKX11} != "no"
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #
 
@@ -178,22 +185,27 @@ 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)
 BUILDTARGETS+=	cleandir
 .endif
+.if ${USETOOLS} == "yes"
 .if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=	obj
+BUILDTARGETS+=	do-tools-obj
 .endif
-.if ${USETOOLS} == "yes"
 BUILDTARGETS+=	do-tools
 .endif
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	obj
+.endif
 .if !defined(NODISTRIBDIRS)
 BUILDTARGETS+=	do-distrib-dirs
 .endif
@@ -205,11 +217,15 @@ BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
 BUILDTARGETS+=	do-libgcc
 .endif
+.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 do-sys-rump-net-lib
 BUILDTARGETS+=	do-ld.so
 BUILDTARGETS+=	do-build
-.if ${MKX11} != "no"
+.if ${MKX11} != "no" || ${MKXORG} != "no"
 BUILDTARGETS+=	do-x11
 .endif
 BUILDTARGETS+=	do-obsolete
@@ -356,20 +372,41 @@ 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 sys/rump/net/lib
 do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} ${dir} ${targ}
 .endfor
 .endfor
 
+do-tools-obj: .PHONY .MAKE
+	${MAKEDIRTARGET} tools obj
+
 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
@@ -387,7 +424,14 @@ do-build: .PHONY .MAKE
 .endfor
 
 do-x11: .PHONY .MAKE
+.if ${MKXORG} != "no"
+	${MAKEDIRTARGET} external/mit/xorg build
+.elif ${MKX11} != "no"
 	${MAKEDIRTARGET} x11 build
+.else
+	@echo "Neither MKX11 or MKXORG is enabled"
+	@false
+.endif
 
 do-obsolete: .PHONY .MAKE
 	${MAKEDIRTARGET} etc install-obsolete-lists