[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.284 and 1.296

version 1.284, 2011/06/20 06:52:36 version 1.296, 2012/08/14 13:04:09
Line 48 
Line 48 
 #   installworld:  #   installworld:
 #       Install the distribution from DESTDIR to INSTALLWORLDDIR (which  #       Install the distribution from DESTDIR to INSTALLWORLDDIR (which
 #       defaults to the root directory).  Ensures that INSTALLWORLDDIR  #       defaults to the root directory).  Ensures that INSTALLWORLDDIR
 #       is the not root directory if cross compiling.  #       is not the root directory if cross compiling.
 #   release:  #   release:
 #       Does a `make distribution', and then tars up the DESTDIR files  #       Does a `make distribution', and then tars up the DESTDIR files
 #       into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.  #       into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.
Line 71 
Line 71 
 #       Create CD-ROM image with source in RELEASEDIR/iso.  #       Create CD-ROM image with source in RELEASEDIR/iso.
 #       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:
   #       Create bootable live image for emulators or USB stick etc.
   #       in RELEASEDIR/liveimage.
   #       RELEASEDIR must already have been populated by `make release'
   #       or equivalent.
   #   install-image:
   #       Create bootable installation image for USB stick etc.
   #       in RELEASEDIR/installimage.
   #       RELEASEDIR must already have been populated by `make release'
   #       or equivalent.
 #  #
 # Targets invoked by `make build,' in order:  # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.  #   cleandir:        cleans the tree.
Line 178  afterinstall: .PHONY .MAKE
Line 188  afterinstall: .PHONY .MAKE
 .endif  .endif
   
 _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall  _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall
   _POSTINSTALL_ENV= \
           AWK=${TOOL_AWK:Q}               \
           DB=${TOOL_DB:Q}                 \
           MAKE=${MAKE:Q}                  \
           PWD_MKDB=${TOOL_PWD_MKDB:Q}
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
         AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -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 ==="
         AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
         @echo "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete: .NOTMAIN .PHONY  postinstall-fix-obsolete: .NOTMAIN .PHONY
         @echo "   === Removing obsolete files ==="          @echo "   === Removing obsolete files ==="
         AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
         @echo "   ==============================="          @echo "   ==============================="
   
   
Line 201  postinstall-fix-obsolete: .NOTMAIN .PHON
Line 216  postinstall-fix-obsolete: .NOTMAIN .PHON
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${HAVE_GCC} == "4"  .if ${HAVE_GCC} == "4"
 LIBGCC_EXT=4  LIBGCC_EXT=4
   BUILD_CC_LIB_BASEDIR= gnu/lib
   BUILD_CC_LIB_BASETARGET= gnu-lib
 .else  .else
 LIBGCC_EXT=45  LIBGCC_EXT=
   BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
   BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif  .endif
 .endif  .endif
   
Line 242  BUILDTARGETS+= do-lib
Line 261  BUILDTARGETS+= do-lib
 .if ${MKKMOD} != "no"  .if ${MKKMOD} != "no"
 BUILDTARGETS+=  do-sys-modules  BUILDTARGETS+=  do-sys-modules
 .endif  .endif
   .if ${MKRUMP} != "no"
 BUILDTARGETS+=  do-sys-rump-dev-lib do-sys-rump-fs-lib  BUILDTARGETS+=  do-sys-rump-dev-lib do-sys-rump-fs-lib
 BUILDTARGETS+=  do-sys-rump-kern-lib do-sys-rump-net-lib  BUILDTARGETS+=  do-sys-rump-kern-lib do-sys-rump-net-lib
   .endif
 .if ${MKCOMPAT} != "no"  .if ${MKCOMPAT} != "no"
 BUILDTARGETS+=  do-compat-lib-csu  BUILDTARGETS+=  do-compat-lib-csu
 BUILDTARGETS+=  do-compat-libgcc  BUILDTARGETS+=  do-compat-libgcc
Line 338  installworld: .PHONY .MAKE
Line 359  installworld: .PHONY .MAKE
         @printf "make ${.TARGET} finished at: " && date          @printf "make ${.TARGET} finished at: " && date
   
 #  #
   # Install modules from $DESTDIR to $INSTALLMODULESDIR
   #
   installmodules: .PHONY .MAKE
   .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
           @echo "Can't make ${.TARGET} to DESTDIR=/"
           @false
   .endif
   .if !defined(INSTALLMODULESDIR) || \
       ${INSTALLMODULESDIR} == "" || ${INSTALLMODULESDIR} == "/"
   .if (${HOST_UNAME_S} != "NetBSD")
           @echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLMODULESDIR=/"
           @false
   .endif
   .if (${HOST_UNAME_M} != ${MACHINE})
           @echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLMODULESDIR=/"
           @false
   .endif
   .endif
           ${MAKEDIRTARGET} sys/modules install DESTDIR=${INSTALLMODULESDIR:U/}
           @echo   "make ${.TARGET} started at:  ${START_TIME}"
           @printf "make ${.TARGET} finished at: " && date
   
   #
 # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR  # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
 #  #
   
Line 375  iso-image-source: .PHONY
Line 419  iso-image-source: .PHONY
         @printf "make ${.TARGET} finished at: " && date          @printf "make ${.TARGET} finished at: " && date
   
 #  #
   # Create bootable live images.
   #
   
   live-image: .PHONY
           ${MAKEDIRTARGET} etc live-image
           @echo   "make ${.TARGET} started at:  ${START_TIME}"
           @printf "make ${.TARGET} finished at: " && date
   
   #
   # Create bootable installation images.
   #
   
   install-image: .PHONY
           ${MAKEDIRTARGET} etc install-image
           @echo   "make ${.TARGET} started at:  ${START_TIME}"
           @printf "make ${.TARGET} finished at: " && date
   
   #
 # Special components of the "make build" process.  # Special components of the "make build" process.
 #  #
   
Line 409  do-${targ}: .PHONY ${targ}
Line 471  do-${targ}: .PHONY ${targ}
   
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${USE_COMPILERCRTSTUFF} == "yes"  .if ${USE_COMPILERCRTSTUFF} == "yes"
 BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}  BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT}
 .endif  .endif
 BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}  BUILD_CC_LIB+= ${BUILD_CC_LIB_BASEDIR}/libgcc${LIBGCC_EXT}
 .elif defined(HAVE_PCC)  .elif defined(HAVE_PCC)
 BUILD_CC_LIB+= external/bsd/pcc/crtstuff  BUILD_CC_LIB+= external/bsd/pcc/crtstuff
 BUILD_CC_LIB+= external/bsd/pcc/libpcc  BUILD_CC_LIB+= external/bsd/pcc/libpcc
Line 444  do-libgcc: .PHONY .MAKE
Line 506  do-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
 .if ${USE_COMPILERCRTSTUFF} == "yes"  .if ${USE_COMPILERCRTSTUFF} == "yes"
         ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}          ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
 .endif  .endif
         ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}          ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif  .endif
 .endif  .endif
   
Line 454  do-compat-libgcc: .PHONY .MAKE
Line 516  do-compat-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
 .if ${USE_COMPILERCRTSTUFF} == "yes"  .if ${USE_COMPILERCRTSTUFF} == "yes"
         ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}          ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
 .endif  .endif
         ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}          ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif  .endif
 .endif  .endif
   
Line 508  do-obsolete: .PHONY .MAKE
Line 570  do-obsolete: .PHONY .MAKE
 # (Tells <bsd.subdir.mk> not to recurse for them.)  # (Tells <bsd.subdir.mk> not to recurse for them.)
 #  #
   
 .for dir in bin etc distrib games libexec regress sbin usr.sbin tools  .for dir in bin etc distrib games libexec regress sbin usr.bin usr.sbin tools
 includes-${dir}: .PHONY  includes-${dir}: .PHONY
         @true          @true
 .endfor  .endfor
Line 529  dependall-distrib depend-distrib all-dis
Line 591  dependall-distrib depend-distrib all-dis
 .include <bsd.kernobj.mk>  .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>  .include <bsd.subdir.mk>
   
 build-docs: .PHONY ${.CURDIR}/BUILDING  
 ${.CURDIR}/BUILDING: doc/BUILDING.mdoc  
         ${_MKMSG_CREATE} ${.TARGET}  
         ${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@  
   
   
 #  #
 # Display current make(1) parameters  # Display current make(1) parameters
 #  #

Legend:
Removed from v.1.284  
changed lines
  Added in v.1.296

CVSweb <webmaster@jp.NetBSD.org>