[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/Makefile between version 1.295 and 1.305

version 1.295, 2012/08/14 12:37:41 version 1.305, 2014/02/26 09:54:32
Line 87 
Line 87 
 #   do-top-obj:      creates the top level object directory.  #   do-top-obj:      creates the top level object directory.
 #   do-tools-obj:    creates object directories for the host toolchain.  #   do-tools-obj:    creates object directories for the host toolchain.
 #   do-tools:        builds host toolchain.  #   do-tools:        builds host toolchain.
   #   params:          record the values of variables that might affect the
   #                    build.
 #   obj:             creates object directories.  #   obj:             creates object directories.
 #   do-distrib-dirs: creates the distribution directories.  #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.  #   includes:        installs include files.
 #   do-tools-compat: builds the "libnbcompat" library; needed for some  #   do-lib:          builds and installs prerequisites from lib
 #                    random host tool programs in the source tree.  
 #   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 (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-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".  #                    if ${MKCOMPAT} != "no".
 #   do-compat-libgcc: builds and installs prerequisites from  #   do-compat-lib:   builds and installs prerequisites from compat/lib
 #                    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".  #                    if ${MKCOMPAT} != "no".
 #   do-build:        builds and installs the entire system.  #   do-build:        builds and installs the entire system.
 #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either  #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
Line 157  _SRC_TOP_OBJ_=
Line 139  _SRC_TOP_OBJ_=
 #  #
 _SUBDIR=        tools lib include gnu external crypto/external bin games  _SUBDIR=        tools lib include gnu external crypto/external bin games
 _SUBDIR+=       libexec sbin usr.bin  _SUBDIR+=       libexec sbin usr.bin
 _SUBDIR+=       usr.sbin share rescue sys etc tests compat .WAIT distrib regress  _SUBDIR+=       usr.sbin share sys etc tests compat
   _SUBDIR+=       .WAIT rescue .WAIT distrib regress
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
 .if "${dir}" == ".WAIT" \  .if "${dir}" == ".WAIT" \
Line 191  _POSTINSTALL= ${.CURDIR}/usr.sbin/postin
Line 174  _POSTINSTALL= ${.CURDIR}/usr.sbin/postin
 _POSTINSTALL_ENV= \  _POSTINSTALL_ENV= \
         AWK=${TOOL_AWK:Q}               \          AWK=${TOOL_AWK:Q}               \
         DB=${TOOL_DB:Q}                 \          DB=${TOOL_DB:Q}                 \
         GREP=${TOOL_GREP:Q}             \          HOST_SH=${HOST_SH:Q}            \
         MAKE=${MAKE:Q}                  \          MAKE=${MAKE:Q}                  \
         PWD_MKDB=${TOOL_PWD_MKDB:Q}          PWD_MKDB=${TOOL_PWD_MKDB:Q}     \
           STAT=${TOOL_STAT:Q}
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
Line 221  BUILD_CC_LIB_BASEDIR= gnu/lib
Line 205  BUILD_CC_LIB_BASEDIR= gnu/lib
 BUILD_CC_LIB_BASETARGET= gnu-lib  BUILD_CC_LIB_BASETARGET= gnu-lib
 .else  .else
 LIBGCC_EXT=  LIBGCC_EXT=
 BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib  BUILD_CC_LIB_BASEDIR= external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib
 BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib  BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif  .endif
 .endif  .endif
Line 239  BUILDTARGETS+= do-tools-obj
Line 223  BUILDTARGETS+= do-tools-obj
 .endif  .endif
 BUILDTARGETS+=  do-tools  BUILDTARGETS+=  do-tools
 .endif # USETOOLS               # }  .endif # USETOOLS               # }
   BUILDTARGETS+=  params
 .if ${MKOBJDIRS} != "no"  .if ${MKOBJDIRS} != "no"
 BUILDTARGETS+=  obj  BUILDTARGETS+=  obj
 .endif  .endif
Line 249  BUILDTARGETS+= do-distrib-dirs
Line 234  BUILDTARGETS+= do-distrib-dirs
 .if !defined(NOINCLUDES)  .if !defined(NOINCLUDES)
 BUILDTARGETS+=  includes  BUILDTARGETS+=  includes
 .endif  .endif
 BUILDTARGETS+=  do-tools-compat  
 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  BUILDTARGETS+=  do-lib
 .if ${MKKMOD} != "no"  BUILDTARGETS+=  do-compat-lib
 BUILDTARGETS+=  do-sys-modules  
 .endif  
 .if ${MKRUMP} != "no"  
 BUILDTARGETS+=  do-sys-rump-dev-lib do-sys-rump-fs-lib  
 BUILDTARGETS+=  do-sys-rump-kern-lib do-sys-rump-net-lib  
 .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  BUILDTARGETS+=  do-build
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
Line 290  includes-lib: .PHONY includes-include in
Line 254  includes-lib: .PHONY includes-include in
 includes-gnu:   .PHONY includes-lib  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 <bsd.own.mk>.
   #
   .include "${NETBSDSRCDIR}/etc/Makefile.params"
   CLEANDIRFILES+= params
   params: .EXEC
           ${_MKMSG_CREATE} params
           @${PRINT_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
   
   #
   # Display current make(1) parameters
   #
   show-params: .PHONY .MAKE
           @${PRINT_PARAMS}
   
   #
 # Build the system and install into DESTDIR.  # Build the system and install into DESTDIR.
 #  #
   
Line 470  do-${targ}: .PHONY ${targ}
Line 460  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 .if defined(HAVE_GCC)  do-tools: .PHONY .MAKE
 .if ${USE_COMPILERCRTSTUFF} == "yes"          ${MAKEDIRTARGET} tools build_install
 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 sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules  do-lib: .PHONY .MAKE
 do-${dir:S/\//-/g}: .PHONY .MAKE          ${MAKEDIRTARGET} lib build_install
 .for targ in dependall install  
         ${MAKEDIRTARGET} ${dir} ${targ}  
 .endfor  
 .endfor  
   
 .if ${MKCOMPAT} != "no"  do-compat-lib: .PHONY .MAKE
 COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc          ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"
 .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  do-top-obj: .PHONY .MAKE
         ${MAKEDIRTARGET} . obj NOSUBDIR=          ${MAKEDIRTARGET} . obj NOSUBDIR=
Line 503  do-top-obj: .PHONY .MAKE
Line 475  do-top-obj: .PHONY .MAKE
 do-tools-obj: .PHONY .MAKE  do-tools-obj: .PHONY .MAKE
         ${MAKEDIRTARGET} tools obj          ${MAKEDIRTARGET} tools obj
   
 do-libgcc: .PHONY .MAKE  
 .if defined(HAVE_GCC)  
 .if ${MKGCC} != "no"  
 .if ${USE_COMPILERCRTSTUFF} == "yes"  
         ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}  
 .endif  
         ${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  
         ${MAKEDIRTARGET} libexec/ld.elf_so ${targ}  
 .endfor  
   
 do-build: .PHONY .MAKE  do-build: .PHONY .MAKE
 .for targ in dependall install  .for targ in dependall install
         ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no          ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
Line 587  install-${dir}: .PHONY
Line 524  install-${dir}: .PHONY
 dependall-distrib depend-distrib all-distrib: .PHONY  dependall-distrib depend-distrib all-distrib: .PHONY
         @true          @true
   
 .include <bsd.sys.mk>  
 .include <bsd.obj.mk>  .include <bsd.obj.mk>
 .include <bsd.kernobj.mk>  .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>  .include <bsd.subdir.mk>
   
 #  
 # Display current make(1) parameters  
 #  
 params: .PHONY .MAKE  
         ${MAKEDIRTARGET} etc params  
Legend:
Removed from v.1.295  
changed lines
  Added in v.1.305
CVSweb <webmaster@jp.NetBSD.org>