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.2 retrieving revision 1.292 diff -u -p -r1.252.4.2 -r1.292 --- src/Makefile 2008/09/18 04:27:24 1.252.4.2 +++ src/Makefile 2012/04/21 08:28:00 1.292 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.252.4.2 2008/09/18 04:27:24 wrstuden Exp $ +# $NetBSD: Makefile,v 1.292 2012/04/21 08:28:00 veego Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -48,7 +48,7 @@ # 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 distribution', and then tars up the DESTDIR files # into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format. @@ -71,11 +71,23 @@ # 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. +# 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 @@ -85,17 +97,28 @@ # 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. +# external/bsd/pcc/crtstuff (if necessary) 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-dev-lib: builds and installs prerequisites from sys/rump/dev/lib +# do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/lib +# do-sys-rump-kern-lib: builds and installs prereq. from sys/rump/kern/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 X11; either -# X11R7 from src/external/mit/xorg if ${MKORG} != "no" -# or 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). # @@ -128,15 +151,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 @@ -166,17 +191,17 @@ _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 " ===============================" @@ -184,10 +209,14 @@ postinstall-fix-obsolete: .NOTMAIN .PHON # Targets (in order!) called by "make build". # .if defined(HAVE_GCC) -.if ${HAVE_GCC} == "3" -LIBGCC_EXT=3 -.else +.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 @@ -196,11 +225,18 @@ 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 # } +.if ${MKOBJDIRS} != "no" +BUILDTARGETS+= obj .endif +BUILDTARGETS+= clean_METALOG .if !defined(NODISTRIBDIRS) BUILDTARGETS+= do-distrib-dirs .endif @@ -216,13 +252,25 @@ BUILDTARGETS+= do-libgcc 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-lib +.if ${MKKMOD} != "no" +BUILDTARGETS+= do-sys-modules +.endif +BUILDTARGETS+= do-sys-rump-dev-lib do-sys-rump-fs-lib +BUILDTARGETS+= do-sys-rump-kern-lib do-sys-rump-net-lib +.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" || ${MKXORG} != "no" +.if ${MKX11} != "no" BUILDTARGETS+= do-x11 .endif +.if ${MKEXTSRC} != "no" +BUILDTARGETS+= do-extsrc +.endif BUILDTARGETS+= do-obsolete # @@ -298,12 +346,35 @@ installworld: .PHONY .MAKE .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 # @@ -341,6 +412,24 @@ iso-image-source: .PHONY @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 + +# # Special components of the "make build" process. # @@ -355,6 +444,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=/ @@ -368,46 +463,71 @@ do-${targ}: .PHONY ${targ} .endfor .if defined(HAVE_GCC) -BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT} -BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT} +.if ${USE_COMPILERCRTSTUFF} == "yes" +BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT} +.endif +BUILD_CC_LIB+= ${BUILD_CC_LIB_BASEDIR}/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 +.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules do-${dir:S/\//-/g}: .PHONY .MAKE .for targ in dependall install ${MAKEDIRTARGET} ${dir} ${targ} .endfor .endfor +.if ${MKCOMPAT} != "no" +COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc +.for dir in ${COMPAT_SUBDIR_LIST} +do-compat-${dir:S/\//-/g}: .PHONY .MAKE +.for targ in dependall install + ${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}" +.endfor +.endfor +.endif + +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} +.if ${USE_COMPILERCRTSTUFF} == "yes" + ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT} .endif - ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT} + ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT} +.endif +.endif + +do-compat-libgcc: .PHONY .MAKE +.if defined(HAVE_GCC) +.if ${MKGCC} != "no" +.if ${USE_COMPILERCRTSTUFF} == "yes" + ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT} +.endif + ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT} .endif .endif do-libpcc: .PHONY .MAKE .if defined(HAVE_PCC) .if ${MKPCC} != "no" +.if ${USE_COMPILERCRTSTUFF} == "yes" ${MAKEDIRTARGET} . do-pcc-lib-crtstuff +.endif ${MAKEDIRTARGET} . do-pcc-lib-libpcc .endif .endif do-ld.so: .PHONY .MAKE .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-build: .PHONY .MAKE @@ -416,12 +536,22 @@ do-build: .PHONY .MAKE .endfor do-x11: .PHONY .MAKE -.if ${MKXORG} != "no" +.if ${MKX11} != "no" +.if ${X11FLAVOUR} == "Xorg" ${MAKEDIRTARGET} external/mit/xorg build -.elif ${MKX11} != "no" +.else ${MAKEDIRTARGET} x11 build +.endif +.else + @echo "MKX11 is not enabled" + @false +.endif + +do-extsrc: .PHONY .MAKE +.if ${MKEXTSRC} != "no" + ${MAKEDIRTARGET} extsrc build .else - @echo "Neither MKX11 or MKXORG is enabled" + @echo "MKEXTSRC is not enabled" @false .endif @@ -433,7 +563,7 @@ do-obsolete: .PHONY .MAKE # (Tells 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 @@ -454,12 +584,6 @@ dependall-distrib depend-distrib all-dis .include .include -build-docs: .PHONY ${.CURDIR}/BUILDING -${.CURDIR}/BUILDING: doc/BUILDING.mdoc - ${_MKMSG_CREATE} ${.TARGET} - ${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@ - - # # Display current make(1) parameters #