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.254 retrieving revision 1.271 diff -u -p -r1.254 -r1.271 --- src/Makefile 2008/07/29 04:49:43 1.254 +++ src/Makefile 2009/06/07 22:46:12 1.271 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.254 2008/07/29 04:49:43 mrg Exp $ +# $NetBSD: Makefile,v 1.271 2009/06/07 22:46:12 christos Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -74,8 +74,10 @@ # # 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. +# 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 +86,27 @@ # 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-sys-modules: builds and installs kernel modules (used by rump binaries) # do-ld.so: builds and installs prerequisites from libexec/ld.*_so. +# do-compat-lib-csu: builds and installs prerequisites from compat/lib/csu +# if ${MKCOMPAT} != "no". +# do-compat-libgcc: builds and installs prerequisites from +# compat/gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and +# compat/gnu/lib/libgcc${LIBGCC_EXT} if ${MKCOMPAT} != "no". +# do-compat-lib-libc: builds and installs prerequisites from compat/lib/libc +# 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-obsolete: installs the obsolete sets (for the postinstall-* targets). # @@ -123,15 +139,17 @@ _SRC_TOP_OBJ_= .endfor .endif -_SUBDIR= tools lib include gnu external bin games libexec sbin usr.bin -_SUBDIR+= usr.sbin share rescue sys etc tests .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 ("${dir}" == ".WAIT") || exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no") +.if "${dir}" == ".WAIT" \ + || (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile)) SUBDIR+= ${dir} .endif .endfor @@ -161,39 +179,48 @@ _POSTINSTALL= ${.CURDIR}/usr.sbin/postin postinstall-check: .PHONY @echo " === Post installation checks ===" - ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi + AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${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} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix + AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${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 + AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete @echo " ===============================" # # 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 ${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 # } +.if ${MKOBJDIRS} != "no" +BUILDTARGETS+= obj .endif +BUILDTARGETS+= clean_METALOG .if !defined(NODISTRIBDIRS) BUILDTARGETS+= do-distrib-dirs .endif @@ -205,8 +232,20 @@ 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 +.if (${MACHINE} != "evbppc") +BUILDTARGETS+= do-sys-modules +.endif +.if ${MKCOMPAT} != "no" +BUILDTARGETS+= do-compat-lib-csu +BUILDTARGETS+= do-compat-libgcc +BUILDTARGETS+= do-compat-lib-libc +.endif BUILDTARGETS+= do-ld.so BUILDTARGETS+= do-build .if ${MKX11} != "no" @@ -344,6 +383,12 @@ check-tools: .PHONY @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!' .endif +# 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=/ @@ -356,20 +401,58 @@ 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 + +.if ${MKCOMPAT} != "no" +BUILD_COMPAT_LIBS= compat/lib/csu ${BUILD_CC_LIB:S/^/compat\//} compat/lib/libc +.else +BUILD_COMPAT_LIBS= +.endif + +.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib crypto/external/lib sys/rump/fs/lib sys/rump/net/lib sys/modules ${BUILD_COMPAT_LIBS} do-${dir:S/\//-/g}: .PHONY .MAKE .for targ in dependall install ${MAKEDIRTARGET} ${dir} ${targ} .endfor .endfor +do-top-obj: .PHONY .MAKE + ${MAKEDIRTARGET} . obj NOSUBDIR= + +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-compat-libgcc: .PHONY .MAKE +.if defined(HAVE_GCC) +.if ${MKGCC} != "no" + ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT} + ${MAKEDIRTARGET} . do-compat-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,11 +470,16 @@ do-build: .PHONY .MAKE .endfor do-x11: .PHONY .MAKE -.if ${MKXORG} != "no" +.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 .MAKE ${MAKEDIRTARGET} etc install-obsolete-lists