[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.2.3 and 1.300

version 1.299.2.3, 2014/08/19 23:45:10 version 1.300, 2012/11/04 11:02:11
Line 92 
Line 92 
 #   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 141  _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 sys etc tests compat  _SUBDIR+=       usr.sbin share rescue sys etc tests compat .WAIT distrib regress
 _SUBDIR+=       .WAIT rescue .WAIT distrib regress  
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
 .if "${dir}" == ".WAIT" \  .if "${dir}" == ".WAIT" \
Line 170  afterinstall: .PHONY .MAKE
Line 171  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 196  postinstall-fix-obsolete: .NOTMAIN .PHON
Line 195  postinstall-fix-obsolete: .NOTMAIN .PHON
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
         @echo "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete_stand: .NOTMAIN .PHONY  
         @echo "   === Removing obsolete files ==="  
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete_stand  
         @echo "   ==============================="  
   
   
 #  #
 # Targets (in order!) called by "make build".  # Targets (in order!) called by "make build".
 #  #
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 BUILD_CC_LIB_BASEDIR= external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib  .if ${HAVE_GCC} == "4"
   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 260  includes-gnu: .PHONY includes-lib
Line 261  includes-gnu: .PHONY includes-lib
 #  #
 # This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.  # This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.
 #  #
 .include "${NETBSDSRCDIR}/etc/Makefile.params"  
 CLEANDIRFILES+= params  CLEANDIRFILES+= params
 params: .EXEC  params: .EXEC
         ${_MKMSG_CREATE} params          ${_MKMSG_CREATE} params
         @${PRINT_PARAMS} >${.TARGET}.new          @(${MAKEDIRTARGET:S/^@//} etc params) >${.TARGET}.new
         @if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \          @if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \
                 : "params is unchanged" ; \                  : "params is unchanged" ; \
                 rm ${.TARGET}.new ; \                  rm ${.TARGET}.new ; \
Line 274  params: .EXEC
Line 275  params: .EXEC
         fi          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 313  distribution buildworld: .PHONY .MAKE
Line 308  distribution buildworld: .PHONY .MAKE
         ${MAKEDIRTARGET} etc distribution INSTALL_DONE=1          ${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"  .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
         ${MAKEDIRTARGET} . postinstall-fix-obsolete          ${MAKEDIRTARGET} . postinstall-fix-obsolete
         ${MAKEDIRTARGET} . postinstall-fix-obsolete_stand  
         ${MAKEDIRTARGET} distrib/sets checkflist          ${MAKEDIRTARGET} distrib/sets checkflist
 .endif  .endif
         @echo   "make ${.TARGET} started at:  ${START_TIME}"          @echo   "make ${.TARGET} started at:  ${START_TIME}"
Line 461  do-${targ}: .PHONY ${targ}
Line 455  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 do-tools: .PHONY .MAKE  .for dir in tools tools/compat
         ${MAKEDIRTARGET} tools build_install  do-${dir:S/\//-/g}: .PHONY .MAKE
   .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 525  install-${dir}: .PHONY
Line 523  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
   #
   show-params: .PHONY .MAKE
           ${MAKEDIRTARGET} etc params

Legend:
Removed from v.1.299.2.3  
changed lines
  Added in v.1.300

CVSweb <webmaster@jp.NetBSD.org>