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.299 retrieving revision 1.299.2.1 diff -u -p -r1.299 -r1.299.2.1 --- src/Makefile 2012/08/17 16:22:27 1.299 +++ src/Makefile 2012/11/20 02:57:27 1.299.2.1 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.299 2012/08/17 16:22:27 joerg Exp $ +# $NetBSD: Makefile,v 1.299.2.1 2012/11/20 02:57:27 tls Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -87,11 +87,11 @@ # do-top-obj: creates the top level object directory. # do-tools-obj: creates object directories for the host toolchain. # do-tools: builds host toolchain. +# params: record the values of variables that might affect the +# build. # 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-lib: builds and installs prerequisites from lib # if ${MKCOMPAT} != "no". # do-compat-lib: builds and installs prerequisites from compat/lib @@ -222,6 +222,7 @@ BUILDTARGETS+= do-tools-obj .endif BUILDTARGETS+= do-tools .endif # USETOOLS # } +BUILDTARGETS+= params .if ${MKOBJDIRS} != "no" BUILDTARGETS+= obj .endif @@ -252,6 +253,26 @@ includes-lib: .PHONY includes-include in includes-gnu: .PHONY includes-lib # +# Record the values of variables that might affect the build. +# If no values have changed, avoid updating the timestamp +# of the params file. +# +# This is referenced by _NETBSD_VERSION_DEPENDS in . +# + +CLEANDIRFILES+= params +params: .EXEC + ${_MKMSG_CREATE} params + @(${MAKEDIRTARGET:S/^@//} etc params) >${.TARGET}.new + @if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \ + : "params is unchanged" ; \ + rm ${.TARGET}.new ; \ + else \ + : "params has changed or is new" ; \ + mv ${.TARGET}.new ${.TARGET} ; \ + fi + +# # Build the system and install into DESTDIR. # @@ -432,12 +453,8 @@ do-${targ}: .PHONY ${targ} @true .endfor -.for dir in tools tools/compat -do-${dir:S/\//-/g}: .PHONY .MAKE -.for targ in dependall install - ${MAKEDIRTARGET} ${dir} ${targ} -.endfor -.endfor +do-tools: .PHONY .MAKE + ${MAKEDIRTARGET} tools build_install do-lib: .PHONY .MAKE ${MAKEDIRTARGET} lib build_install @@ -508,5 +525,5 @@ dependall-distrib depend-distrib all-dis # # Display current make(1) parameters # -params: .PHONY .MAKE +show-params: .PHONY .MAKE ${MAKEDIRTARGET} etc params