[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.245 and 1.301

version 1.245, 2006/06/02 22:16:18 version 1.301, 2012/11/15 23:51:53
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/${MACHINE}, in release(7) format.  #       into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.
 #       (See etc/Makefile for more information on this.)  #       (See etc/Makefile for more information on this.)
 #   regression-tests:  #   regression-tests:
 #       Runs the regression tests in "regress" on this host.  #       Runs the regression tests in "regress" on this host.
 #   sets:  #   sets:
 #       Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR}  #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
   #       from ${DESTDIR}
 #   sourcesets:  #   sourcesets:
 #       Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}  #       Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
 #   syspkgs:  #   syspkgs:
 #       Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}  #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
   #       from ${DESTDIR}
 #   iso-image:  #   iso-image:
 #       Create CD-ROM image in RELEASEDIR/MACHINE/installation.  #       Create CD-ROM image in RELEASEDIR/iso.
   #       RELEASEDIR must already have been populated by `make release'
   #       or equivalent.
   #   iso-image-source:
   #       Create CD-ROM image with source in RELEASEDIR/iso.
   #       RELEASEDIR must already have been populated by
   #       `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'  #       RELEASEDIR must already have been populated by `make release'
 #       or equivalent.  #       or equivalent.
 #  #
 # Targets invoked by `make build,' in order:  # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.  #   cleandir:        cleans the tree.
 #   obj:             creates object directories.  #   do-top-obj:      creates the top level object directory.
   #   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.
 #   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.  #                    if ${MKCOMPAT} != "no".
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.  #   do-compat-lib:   builds and installs prerequisites from compat/lib
 #   do-gnu-lib-crtstuff3: builds and installs prerequisites from  #                    if ${MKCOMPAT} != "no".
 #                         gnu/lib/crtstuff3  
 #   do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3  
 #   do-lib-libc:     builds and installs prerequisites from lib/libc.  
 #   do-lib:          builds and installs prerequisites from lib.  
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.  
 #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.  
 #   do-build:        builds and installs the entire system.  #   do-build:        builds and installs the entire system.
 #   do-x11:          builds and installs X11R6 from src/x11 if ${MKX11} != "no"  #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
   #                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
   #                    or X11R6 from src/x11
   #   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).  #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #  #
   
Line 116  _SRC_TOP_OBJ_=
Line 133  _SRC_TOP_OBJ_=
 .endfor  .endfor
 .endif  .endif
   
 _SUBDIR=        tools lib include gnu bin games libexec sbin usr.bin  
 _SUBDIR+=       usr.sbin share rescue sys etc .WAIT distrib regress  
   
 #  #
 # Weed out directories that don't exist.  # _SUBDIR is used to set SUBDIR, after removing directories that have
   # BUILD_${dir}=no, or that have no ${dir}/Makefile.
 #  #
   _SUBDIR=        tools lib include gnu external crypto/external bin games
   _SUBDIR+=       libexec sbin usr.bin
   _SUBDIR+=       usr.sbin share rescue sys etc tests compat .WAIT distrib regress
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
 .if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")  .if "${dir}" == ".WAIT" \
           || (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile))
 SUBDIR+=        ${dir}  SUBDIR+=        ${dir}
 .endif  .endif
 .endfor  .endfor
Line 151  afterinstall: .PHONY .MAKE
Line 170  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}                 \
           HOST_SH=${HOST_SH:Q}            \
           MAKE=${MAKE: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 ==="
         ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check          ${_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 ==="
         ${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 ==="
         ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
         @echo "   ==============================="          @echo "   ==============================="
   
   
 #  #
 # Targets (in order!) called by "make build".  # Targets (in order!) called by "make build".
 #  #
 .if ${HAVE_GCC} == "3"  .if defined(HAVE_GCC)
 LIBGCC_EXT=3  .if ${HAVE_GCC} == "4"
 .else  
 LIBGCC_EXT=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  .endif
   
 BUILDTARGETS+=  check-tools  BUILDTARGETS+=  check-tools
Line 182  BUILDTARGETS+= check-tools
Line 214  BUILDTARGETS+= check-tools
 BUILDTARGETS+=  cleandir  BUILDTARGETS+=  cleandir
 .endif  .endif
 .if ${MKOBJDIRS} != "no"  .if ${MKOBJDIRS} != "no"
 BUILDTARGETS+=  obj  BUILDTARGETS+=  do-top-obj
   .endif
   .if ${USETOOLS} == "yes"        # {
   .if ${MKOBJDIRS} != "no"
   BUILDTARGETS+=  do-tools-obj
 .endif  .endif
 .if ${USETOOLS} == "yes"  
 BUILDTARGETS+=  do-tools  BUILDTARGETS+=  do-tools
   .endif # USETOOLS               # }
   BUILDTARGETS+=  params
   .if ${MKOBJDIRS} != "no"
   BUILDTARGETS+=  obj
 .endif  .endif
   BUILDTARGETS+=  clean_METALOG
 .if !defined(NODISTRIBDIRS)  .if !defined(NODISTRIBDIRS)
 BUILDTARGETS+=  do-distrib-dirs  BUILDTARGETS+=  do-distrib-dirs
 .endif  .endif
 .if !defined(NOINCLUDES)  .if !defined(NOINCLUDES)
 BUILDTARGETS+=  includes  BUILDTARGETS+=  includes
 .endif  .endif
 BUILDTARGETS+=  do-tools-compat  BUILDTARGETS+=  do-lib
 BUILDTARGETS+=  do-lib-csu  BUILDTARGETS+=  do-compat-lib
 .if ${MKGCC} != "no"  
 .if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")  
 BUILDTARGETS+=  do-gnu-lib-crtstuff${LIBGCC_EXT}  
 .endif  
 BUILDTARGETS+=  do-gnu-lib-libgcc${LIBGCC_EXT}  
 .endif  
 BUILDTARGETS+=  do-lib-libc  
 BUILDTARGETS+=  do-lib do-gnu-lib  
 BUILDTARGETS+=  do-ld.so  
 BUILDTARGETS+=  do-build  BUILDTARGETS+=  do-build
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
 .endif  .endif
   .if ${MKEXTSRC} != "no"
   BUILDTARGETS+=  do-extsrc
   .endif
 BUILDTARGETS+=  do-obsolete  BUILDTARGETS+=  do-obsolete
   
 #  #
Line 219  includes-lib: .PHONY includes-include in
Line 253  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>.
   #
   
   CLEANDIRFILES+= params
   params: .EXEC
           ${_MKMSG_CREATE} params
           @(${MAKEDIRTARGET:S/^@//} etc 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
   
   #
 # Build the system and install into DESTDIR.  # Build the system and install into DESTDIR.
 #  #
   
Line 283  installworld: .PHONY .MAKE
Line 337  installworld: .PHONY .MAKE
 .endif  .endif
 .endif  .endif
         ${MAKEDIRTARGET} distrib/sets installsets \          ${MAKEDIRTARGET} distrib/sets installsets \
             INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=                  INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=${INSTALLSETS:Q}
         ${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}          ${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}
         @echo   "make ${.TARGET} started at:  ${START_TIME}"          @echo   "make ${.TARGET} started at:  ${START_TIME}"
         @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 314  release snapshot: .PHONY .MAKE
Line 391  release snapshot: .PHONY .MAKE
 #  #
   
 iso-image: .PHONY  iso-image: .PHONY
           ${MAKEDIRTARGET} distrib iso_image
           ${MAKEDIRTARGET} etc iso-image
           @echo   "make ${.TARGET} started at:  ${START_TIME}"
           @printf "make ${.TARGET} finished at: " && date
   
   iso-image-source: .PHONY
           ${MAKEDIRTARGET} distrib iso_image CDSOURCE=true
         ${MAKEDIRTARGET} etc iso-image          ${MAKEDIRTARGET} etc iso-image
         @echo   "make ${.TARGET} started at:  ${START_TIME}"          @echo   "make ${.TARGET} started at:  ${START_TIME}"
         @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 333  check-tools: .PHONY
Line 435  check-tools: .PHONY
         @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'          @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif  .endif
   
   # Delete or sanitise a leftover METALOG from a previous build.
   clean_METALOG: .PHONY .MAKE
   .if ${MKUPDATE} != "no"
           ${MAKEDIRTARGET} distrib/sets clean_METALOG
   .endif
   
 do-distrib-dirs: .PHONY .MAKE  do-distrib-dirs: .PHONY .MAKE
 .if !defined(DESTDIR) || ${DESTDIR} == ""  .if !defined(DESTDIR) || ${DESTDIR} == ""
         ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/          ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
Line 345  do-${targ}: .PHONY ${targ}
Line 453  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 .for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib  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-ld.so: .PHONY .MAKE  do-lib: .PHONY .MAKE
 .for targ in dependall install          ${MAKEDIRTARGET} lib build_install
 .if (${OBJECT_FMT} == "a.out")  
         ${MAKEDIRTARGET} libexec/ld.aout_so ${targ}  do-compat-lib: .PHONY .MAKE
 .endif          ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"
 .if (${OBJECT_FMT} == "ELF")  
         ${MAKEDIRTARGET} libexec/ld.elf_so ${targ}  do-top-obj: .PHONY .MAKE
 .endif          ${MAKEDIRTARGET} . obj NOSUBDIR=
 .endfor  
   do-tools-obj: .PHONY .MAKE
           ${MAKEDIRTARGET} tools obj
   
 do-build: .PHONY .MAKE  do-build: .PHONY .MAKE
 .for targ in dependall install  .for targ in dependall install
Line 368  do-build: .PHONY .MAKE
Line 474  do-build: .PHONY .MAKE
 .endfor  .endfor
   
 do-x11: .PHONY .MAKE  do-x11: .PHONY .MAKE
   .if ${MKX11} != "no"
   .if ${X11FLAVOUR} == "Xorg"
           ${MAKEDIRTARGET} external/mit/xorg build
   .else
         ${MAKEDIRTARGET} x11 build          ${MAKEDIRTARGET} x11 build
   .endif
   .else
           @echo "MKX11 is not enabled"
           @false
   .endif
   
   do-extsrc: .PHONY .MAKE
   .if ${MKEXTSRC} != "no"
           ${MAKEDIRTARGET} extsrc build
   .else
           @echo "MKEXTSRC is not enabled"
           @false
   .endif
   
 do-obsolete: .PHONY .MAKE  do-obsolete: .PHONY .MAKE
         ${MAKEDIRTARGET} etc install-obsolete-lists          ${MAKEDIRTARGET} etc install-obsolete-lists
Line 378  do-obsolete: .PHONY .MAKE
Line 501  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 399  dependall-distrib depend-distrib all-dis
Line 522  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
 #  #
 params: .PHONY .MAKE  show-params: .PHONY .MAKE
         ${MAKEDIRTARGET} etc params          ${MAKEDIRTARGET} etc params

Legend:
Removed from v.1.245  
changed lines
  Added in v.1.301

CVSweb <webmaster@jp.NetBSD.org>