[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.303 and 1.315

version 1.303, 2013/07/16 09:52:21 version 1.315, 2015/06/27 16:21:07
Line 64 
Line 64 
 #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs  #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
 #       from ${DESTDIR}  #       from ${DESTDIR}
 #   iso-image:  #   iso-image:
 #       Create CD-ROM image in RELEASEDIR/iso.  #       Create CD-ROM image in RELEASEDIR/images.
 #       RELEASEDIR must already have been populated by `make release'  #       RELEASEDIR must already have been populated by `make release'
 #       or equivalent.  #       or equivalent.
 #   iso-image-source:  #   iso-image-source:
 #       Create CD-ROM image with source in RELEASEDIR/iso.  #       Create CD-ROM image with source in RELEASEDIR/images.
 #       RELEASEDIR must already have been populated by  #       RELEASEDIR must already have been populated by
 #       `make release sourcesets' or equivalent.  #       `make release sourcesets' or equivalent.
 #   live-image:  #   live-image:
Line 170  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}
   
   .if ${MKX11} != "no"
   _POSTINSTALL_X11=-x ${X11SRCDIR:Q}
   .endif
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
         @echo "   ================================"          @echo "   ================================"
   
 postinstall-fix: .NOTMAIN .PHONY  postinstall-fix: .NOTMAIN .PHONY
         @echo "   === Post installation fixes ==="          @echo "   === Post installation fixes ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix
         @echo "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete: .NOTMAIN .PHONY  postinstall-fix-obsolete: .NOTMAIN .PHONY
         @echo "   === Removing obsolete files ==="          @echo "   === Removing obsolete files ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete
           @echo "   ==============================="
   
   postinstall-fix-obsolete_stand: .NOTMAIN .PHONY
           @echo "   === Removing obsolete files ==="
           ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete_stand
         @echo "   ==============================="          @echo "   ==============================="
   
   
 #  #
 # Targets (in order!) called by "make build".  # Targets (in order!) called by "make build".
 #  #
 .if defined(HAVE_GCC)  
 .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  
 .endif  
 .endif  
   
 BUILDTARGETS+=  check-tools  BUILDTARGETS+=  check-tools
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)  .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=  cleandir  BUILDTARGETS+=  cleandir
Line 236  BUILDTARGETS+= includes
Line 235  BUILDTARGETS+= includes
 .endif  .endif
 BUILDTARGETS+=  do-lib  BUILDTARGETS+=  do-lib
 BUILDTARGETS+=  do-compat-lib  BUILDTARGETS+=  do-compat-lib
 BUILDTARGETS+=  do-build  
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
 .endif  .endif
   BUILDTARGETS+=  do-build
 .if ${MKEXTSRC} != "no"  .if ${MKEXTSRC} != "no"
 BUILDTARGETS+=  do-extsrc  BUILDTARGETS+=  do-extsrc
 .endif  .endif
Line 313  distribution buildworld: .PHONY .MAKE
Line 312  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 483  do-build: .PHONY .MAKE
Line 483  do-build: .PHONY .MAKE
 do-x11: .PHONY .MAKE  do-x11: .PHONY .MAKE
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 .if ${X11FLAVOUR} == "Xorg"  .if ${X11FLAVOUR} == "Xorg"
         ${MAKEDIRTARGET} external/mit/xorg build          ${MAKEDIRTARGET} external/mit/xorg/tools all
           ${MAKEDIRTARGET} external/mit/xorg/lib build_install
   .if ${MKCOMPATX11} != "no"
           ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
   .endif
 .else  .else
         ${MAKEDIRTARGET} x11 build          ${MAKEDIRTARGET} x11 build
 .endif  .endif
Line 524  install-${dir}: .PHONY
Line 528  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>

Legend:
Removed from v.1.303  
changed lines
  Added in v.1.315

CVSweb <webmaster@jp.NetBSD.org>