[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.299 and 1.308

version 1.299, 2012/08/17 16:22:27 version 1.308, 2014/06/16 09:04:43
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  
 #                    random host tool programs in the source tree.  
 #   do-lib:          builds and installs prerequisites from lib  #   do-lib:          builds and installs prerequisites from lib
 #                    if ${MKCOMPAT} != "no".  #                    if ${MKCOMPAT} != "no".
 #   do-compat-lib:   builds and installs prerequisites from compat/lib  #   do-compat-lib:   builds and installs prerequisites from compat/lib
Line 139  _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 169  afterinstall: .PHONY .MAKE
Line 170  afterinstall: .PHONY .MAKE
         ${MAKEDIRTARGET} . postinstall-check          ${MAKEDIRTARGET} . postinstall-check
 .endif  .endif
   
 _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall  _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall \
                   -m ${MACHINE} -a ${MACHINE_ARCH}
 _POSTINSTALL_ENV= \  _POSTINSTALL_ENV= \
         AWK=${TOOL_AWK:Q}               \          AWK=${TOOL_AWK:Q}               \
         DB=${TOOL_DB:Q}                 \          DB=${TOOL_DB:Q}                 \
         HOST_SH=${HOST_SH:Q}            \          HOST_SH=${HOST_SH:Q}            \
         MAKE=${MAKE:Q}                  \          MAKE=${MAKE:Q}                  \
         PWD_MKDB=${TOOL_PWD_MKDB:Q}     \          PWD_MKDB=${TOOL_PWD_MKDB:Q}     \
           SED=${TOOL_SED:Q}               \
         STAT=${TOOL_STAT:Q}          STAT=${TOOL_STAT:Q}
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
Line 198  postinstall-fix-obsolete: .NOTMAIN .PHON
Line 201  postinstall-fix-obsolete: .NOTMAIN .PHON
 # Targets (in order!) called by "make build".  # Targets (in order!) called by "make build".
 #  #
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${HAVE_GCC} == "4"  BUILD_CC_LIB_BASEDIR= external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib
 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  BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif  .endif
 .endif  
   
 BUILDTARGETS+=  check-tools  BUILDTARGETS+=  check-tools
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)  .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
Line 222  BUILDTARGETS+= do-tools-obj
Line 218  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 252  includes-lib: .PHONY includes-include in
Line 249  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 432  do-${targ}: .PHONY ${targ}
Line 455  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 .for dir in tools tools/compat  do-tools: .PHONY .MAKE
 do-${dir:S/\//-/g}: .PHONY .MAKE          ${MAKEDIRTARGET} tools build_install
 .for targ in dependall install  
         ${MAKEDIRTARGET} ${dir} ${targ}  
 .endfor  
 .endfor  
   
 do-lib: .PHONY .MAKE  do-lib: .PHONY .MAKE
         ${MAKEDIRTARGET} lib build_install          ${MAKEDIRTARGET} lib build_install
Line 500  install-${dir}: .PHONY
Line 519  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.299  
changed lines
  Added in v.1.308
CVSweb <webmaster@jp.NetBSD.org>