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.268 retrieving revision 1.280 diff -u -p -r1.268 -r1.280 --- src/Makefile 2009/02/25 22:28:36 1.268 +++ src/Makefile 2010/11/28 18:40:54 1.280 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.268 2009/02/25 22:28:36 sketch Exp $ +# $NetBSD: Makefile,v 1.280 2010/11/28 18:40:54 skrll Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -87,17 +87,18 @@ # 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-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-external-lib: builds and installs prerequisites from -# compat/external/lib if ${MKCOMPAT} != "no". # do-compat-lib-csu: builds and installs prerequisites from compat/lib/csu # if ${MKCOMPAT} != "no". # do-compat-libgcc: builds and installs prerequisites from @@ -109,6 +110,7 @@ # 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). # @@ -145,7 +147,8 @@ _SRC_TOP_OBJ_= # _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= 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} @@ -221,6 +224,7 @@ BUILDTARGETS+= do-tools .if ${MKOBJDIRS} != "no" BUILDTARGETS+= obj .endif +BUILDTARGETS+= clean_METALOG .if !defined(NODISTRIBDIRS) BUILDTARGETS+= do-distrib-dirs .endif @@ -237,21 +241,24 @@ 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") +.if (${MACHINE} != "evbppc") && ${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 -BUILDTARGETS+= do-compat-external-lib .endif BUILDTARGETS+= do-ld.so BUILDTARGETS+= do-build .if ${MKX11} != "no" BUILDTARGETS+= do-x11 .endif +.if ${MKEXTSRC} != "no" +BUILDTARGETS+= do-extsrc +.endif BUILDTARGETS+= do-obsolete # @@ -384,6 +391,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=/ @@ -397,27 +410,32 @@ do-${targ}: .PHONY ${targ} .endfor .if defined(HAVE_GCC) +.if ${USE_COMPILERCRTSTUFF} == "yes" BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT} +.endif 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 -BUILD_COMPAT_LIBS+= compat/external/lib -.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 sys/modules ${BUILD_COMPAT_LIBS} +.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib gnu/lib external/lib crypto/external/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 obj dependall install + ${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}" +.endfor +.endfor +.endif + do-top-obj: .PHONY .MAKE ${MAKEDIRTARGET} . obj NOSUBDIR= @@ -427,9 +445,11 @@ do-tools-obj: .PHONY .MAKE do-libgcc: .PHONY .MAKE .if defined(HAVE_GCC) .if ${MKGCC} != "no" +.if ${USE_COMPILERCRTSTUFF} == "yes" .if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4") ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT} .endif +.endif ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT} .endif .endif @@ -437,7 +457,9 @@ do-libgcc: .PHONY .MAKE do-compat-libgcc: .PHONY .MAKE .if defined(HAVE_GCC) .if ${MKGCC} != "no" +.if ${USE_COMPILERCRTSTUFF} == "yes" ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT} +.endif ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT} .endif .endif @@ -445,19 +467,16 @@ do-compat-libgcc: .PHONY .MAKE 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 @@ -477,6 +496,14 @@ do-x11: .PHONY .MAKE @false .endif +do-extsrc: .PHONY .MAKE +.if ${MKEXTSRC} != "no" + ${MAKEDIRTARGET} extsrc build +.else + @echo "MKEXTSRC is not enabled" + @false +.endif + do-obsolete: .PHONY .MAKE ${MAKEDIRTARGET} etc install-obsolete-lists