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.235 retrieving revision 1.262.2.2 diff -u -p -r1.235 -r1.262.2.2 --- src/Makefile 2004/07/30 07:05:11 1.235 +++ src/Makefile 2008/12/06 22:07:34 1.262.2.2 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.235 2004/07/30 07:05:11 lukem Exp $ +# $NetBSD: Makefile,v 1.262.2.2 2008/12/06 22:07:34 snj Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -50,32 +50,62 @@ # defaults to the root directory). Ensures that INSTALLWORLDDIR # is the not 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. # # 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 # random host tool programs in the source tree. -# do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3 # do-lib-csu: builds and installs prerequisites from lib/csu. +# 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-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). # @@ -108,21 +138,22 @@ _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 bin games 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 @@ -131,7 +162,7 @@ regression-tests: .PHONY NOPOSTINSTALL= # defined .endif -afterinstall: .PHONY +afterinstall: .PHONY .MAKE .if ${MKMAN} != "no" ${MAKEDIRTARGET} share/man makedb .endif @@ -142,29 +173,33 @@ afterinstall: .PHONY ${MAKEDIRTARGET} . postinstall-check .endif +_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall + postinstall-check: .PHONY @echo " === Post installation checks ===" - ${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check + 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} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix + MAKE=${MAKE:Q} ${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 + MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete @echo " ===============================" # # Targets (in order!) called by "make build". # -.if ${USE_TOOLS_TOOLCHAIN} == "no" +.if defined(HAVE_GCC) +.if ${HAVE_GCC} == "3" LIBGCC_EXT=3 .else -LIBGCC_EXT= +LIBGCC_EXT=4 +.endif .endif BUILDTARGETS+= check-tools @@ -172,10 +207,16 @@ 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 .if !defined(NODISTRIBDIRS) BUILDTARGETS+= do-distrib-dirs @@ -186,10 +227,19 @@ BUILDTARGETS+= includes BUILDTARGETS+= do-tools-compat BUILDTARGETS+= do-lib-csu .if ${MKGCC} != "no" -BUILDTARGETS+= do-gnu-lib-libgcc${LIBGCC_EXT} +BUILDTARGETS+= do-libgcc +.endif +.if ${MKPCC} != "no" +BUILDTARGET+= do-libpcc .endif BUILDTARGETS+= do-lib-libc -BUILDTARGETS+= do-lib do-gnu-lib +BUILDTARGETS+= do-lib do-gnu-lib do-external-lib +BUILDTARGETS+= do-sys-rump-fs-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" @@ -211,7 +261,7 @@ includes-gnu: .PHONY includes-lib START_TIME!= date -build: .PHONY +build: .PHONY .MAKE .if defined(BUILD_DONE) @echo "Build already installed into ${DESTDIR}" .else @@ -229,7 +279,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=/" @@ -253,7 +303,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 @@ -279,20 +329,36 @@ installworld: .PHONY # 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 @@ -311,7 +377,7 @@ check-tools: .PHONY @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!' .endif -do-distrib-dirs: .PHONY +do-distrib-dirs: .PHONY .MAKE .if !defined(DESTDIR) || ${DESTDIR} == "" ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/ .else @@ -323,14 +389,60 @@ do-${targ}: .PHONY ${targ} @true .endfor -.for dir in tools tools/compat lib/csu gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib -do-${dir:S/\//-/g}: .PHONY +.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 sys/rump/fs/lib sys/rump/net/lib ${BUILD_COMPAT_LIBS} +do-${dir:S/\//-/g}: .PHONY .MAKE .for targ in dependall install ${MAKEDIRTARGET} ${dir} ${targ} .endfor .endfor -do-ld.so: .PHONY +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 .if (${OBJECT_FMT} == "a.out") ${MAKEDIRTARGET} libexec/ld.aout_so ${targ} @@ -340,15 +452,24 @@ do-ld.so: .PHONY .endif .endfor -do-build: .PHONY +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-obsolete: .PHONY .MAKE ${MAKEDIRTARGET} etc install-obsolete-lists # @@ -386,5 +507,5 @@ ${.CURDIR}/BUILDING: doc/BUILDING.mdoc # # Display current make(1) parameters # -params: .PHONY +params: .PHONY .MAKE ${MAKEDIRTARGET} etc params