[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.234 and 1.256

version 1.234, 2004/05/17 07:00:16 version 1.256, 2008/08/24 05:56:20
Line 50 
Line 50 
 #       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 the not root directory if cross compiling.
 #   release:  #   release:
 #       Does a `make build', 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:
   #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
   #       from ${DESTDIR}
   #   iso-image:
   #       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.
 #  #
 # Targets invoked by `make build,' in order:  # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.  #   cleandir:        cleans the tree.
Line 68 
Line 80 
 #   includes:        installs include files.  #   includes:        installs include files.
 #   do-tools-compat: builds the "libnbcompat" library; needed for some  #   do-tools-compat: builds the "libnbcompat" library; needed for some
 #                    random host tool programs in the source tree.  #                    random host tool programs in the source tree.
 #   do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3  
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.  #   do-lib-csu:      builds and installs prerequisites from lib/csu.
   #   do-libgcc:       builds and installs prerequisites from
   #                    gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
   #                    gnu/lib/libgcc${LIBGCC_EXT}.
   #   do-libpcc:       builds and install prerequisites from
   #                    external/bsd/pcc/crtstuff and external/bsd/pcc/libpcc.
 #   do-lib-libc:     builds and installs prerequisites from lib/libc.  #   do-lib-libc:     builds and installs prerequisites from lib/libc.
 #   do-lib-libdes:   builds and installs prerequisites from lib/libdes.  
 #   do-lib:          builds and installs prerequisites from lib.  #   do-lib:          builds and installs prerequisites from lib.
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.  #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
   #   do-external-lib: builds and installs prerequisites from external/lib.
   #   do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/lib
 #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.  #   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 X11R6 from src/x11 if ${MKX11} != "no"
Line 109  _SRC_TOP_OBJ_=
Line 126  _SRC_TOP_OBJ_=
 .endfor  .endfor
 .endif  .endif
   
 _SUBDIR=        tools lib include gnu bin games libexec sbin usr.bin  _SUBDIR=        tools lib include gnu external bin games libexec sbin usr.bin
 _SUBDIR+=       usr.sbin share rescue sys etc .WAIT distrib regress  _SUBDIR+=       usr.sbin share rescue sys etc tests .WAIT distrib regress
   
 #  #
 # Weed out directories that don't exist.  # Weed out directories that don't exist.
 #  #
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
 .if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")  .if ("${dir}" == ".WAIT") || exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
 SUBDIR+=        ${dir}  SUBDIR+=        ${dir}
 .endif  .endif
 .endfor  .endfor
   
 .if exists(regress)  .if exists(regress)
 regression-tests: .PHONY  regression-tests: .PHONY .MAKE
         @echo Running regression tests...          @echo Running regression tests...
         ${MAKEDIRTARGET} regress regress          ${MAKEDIRTARGET} regress regress
 .endif  .endif
Line 132  regression-tests: .PHONY
Line 149  regression-tests: .PHONY
 NOPOSTINSTALL=  # defined  NOPOSTINSTALL=  # defined
 .endif  .endif
   
 afterinstall: .PHONY  afterinstall: .PHONY .MAKE
 .if ${MKMAN} != "no"  .if ${MKMAN} != "no"
         ${MAKEDIRTARGET} share/man makedb          ${MAKEDIRTARGET} share/man makedb
 .endif  .endif
Line 143  afterinstall: .PHONY
Line 160  afterinstall: .PHONY
         ${MAKEDIRTARGET} . postinstall-check          ${MAKEDIRTARGET} . postinstall-check
 .endif  .endif
   
   _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
         ${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check          ${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} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix          ${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} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete          ${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 ${USE_TOOLS_TOOLCHAIN} == "no"  .if defined(HAVE_GCC)
   .if ${HAVE_GCC} == "3"
 LIBGCC_EXT=3  LIBGCC_EXT=3
 .else  .else
 LIBGCC_EXT=  LIBGCC_EXT=4
   .endif
 .endif  .endif
   
 BUILDTARGETS+=  check-tools  BUILDTARGETS+=  check-tools
Line 187  BUILDTARGETS+= includes
Line 208  BUILDTARGETS+= includes
 BUILDTARGETS+=  do-tools-compat  BUILDTARGETS+=  do-tools-compat
 BUILDTARGETS+=  do-lib-csu  BUILDTARGETS+=  do-lib-csu
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
 BUILDTARGETS+=  do-gnu-lib-libgcc${LIBGCC_EXT}  BUILDTARGETS+=  do-libgcc
 .endif  .endif
 BUILDTARGETS+=  do-lib-libc  .if ${MKPCC} != "no"
 .if ${MKCRYPTO} != "no"  BUILDTARGET+=   do-libpcc
 BUILDTARGETS+=  do-lib-libdes  
 .endif  .endif
 BUILDTARGETS+=  do-lib do-gnu-lib  BUILDTARGETS+=  do-lib-libc
   BUILDTARGETS+=  do-lib do-gnu-lib do-external-lib
   BUILDTARGETS+=  do-sys-rump-fs-lib
 BUILDTARGETS+=  do-ld.so  BUILDTARGETS+=  do-ld.so
 BUILDTARGETS+=  do-build  BUILDTARGETS+=  do-build
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
Line 215  includes-gnu: .PHONY includes-lib
Line 237  includes-gnu: .PHONY includes-lib
   
 START_TIME!=    date  START_TIME!=    date
   
 build: .PHONY  build: .PHONY .MAKE
 .if defined(BUILD_DONE)  .if defined(BUILD_DONE)
         @echo "Build already installed into ${DESTDIR}"          @echo "Build already installed into ${DESTDIR}"
 .else  .else
Line 233  build: .PHONY
Line 255  build: .PHONY
 # ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /  # ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
 #  #
   
 distribution buildworld: .PHONY  distribution buildworld: .PHONY .MAKE
 .if make(buildworld) && \  .if make(buildworld) && \
     (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")      (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
         @echo "Won't make ${.TARGET} with DESTDIR=/"          @echo "Won't make ${.TARGET} with DESTDIR=/"
Line 257  distribution buildworld: .PHONY
Line 279  distribution buildworld: .PHONY
 HOST_UNAME_S!=  uname -s  HOST_UNAME_S!=  uname -s
 HOST_UNAME_M!=  uname -m  HOST_UNAME_M!=  uname -m
   
 installworld: .PHONY  installworld: .PHONY .MAKE
 .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")  .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
         @echo "Can't make ${.TARGET} to DESTDIR=/"          @echo "Can't make ${.TARGET} to DESTDIR=/"
         @false          @false
Line 283  installworld: .PHONY
Line 305  installworld: .PHONY
 # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR  # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
 #  #
   
 .for tgt in sets sourcesets  .for tgt in sets sourcesets syspkgs
 ${tgt}: .PHONY  ${tgt}: .PHONY .MAKE
         ${MAKEDIRTARGET} distrib/sets ${tgt}          ${MAKEDIRTARGET} distrib/sets ${tgt}
 .endfor  .endfor
   
 #  #
 # Build a release or snapshot (implies "make build").  Note that  # Build a release or snapshot (implies "make distribution").  Note that
 # in this case, the set lists will be checked before the tar files  # in this case, the set lists will be checked before the tar files
 # are made.  # are made.
 #  #
   
 release snapshot: .PHONY  release snapshot: .PHONY .MAKE
         ${MAKEDIRTARGET} . build NOPOSTINSTALL=1          ${MAKEDIRTARGET} . distribution
         ${MAKEDIRTARGET} etc release INSTALL_DONE=1          ${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1
           @echo   "make ${.TARGET} started at:  ${START_TIME}"
           @printf "make ${.TARGET} finished at: " && date
   
   #
   # Create a CD-ROM image.
   #
   
   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
         @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
   
Line 315  check-tools: .PHONY
Line 353  check-tools: .PHONY
         @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'          @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif  .endif
   
 do-distrib-dirs: .PHONY  do-distrib-dirs: .PHONY .MAKE
 .if !defined(DESTDIR) || ${DESTDIR} == ""  .if !defined(DESTDIR) || ${DESTDIR} == ""
         ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/          ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
 .else  .else
Line 327  do-${targ}: .PHONY ${targ}
Line 365  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 .for dir in tools tools/compat lib/csu gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib  .if defined(HAVE_GCC)
 do-${dir:S/\//-/g}: .PHONY  BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
   BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}
   .elif defined(HAVE_PCC)
   BUILD_CC_LIB+= external/bsd/pcc/crtstuff
   BUILD_CC_LIB+= external/bsd/pcc/libpcc
   .endif
   
   .for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib sys/rump/fs/lib
   do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install  .for targ in dependall install
         ${MAKEDIRTARGET} ${dir} ${targ}          ${MAKEDIRTARGET} ${dir} ${targ}
 .endfor  .endfor
 .endfor  .endfor
   
 do-ld.so: .PHONY  do-libgcc: .PHONY .MAKE
   .if defined(HAVE_GCC)
   .if ${MKGCC} != "no"
   .if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
           ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
   .endif
           ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
   .endif
   .endif
   
   do-libpcc: .PHONY .MAKE
   .if defined(HAVE_PCC)
   .if ${MKPCC} != "no"
           ${MAKEDIRTARGET} . do-pcc-lib-crtstuff
           ${MAKEDIRTARGET} . do-pcc-lib-libpcc
   .endif
   .endif
   
   do-ld.so: .PHONY .MAKE
 .for targ in dependall install  .for targ in dependall install
 .if (${OBJECT_FMT} == "a.out")  .if (${OBJECT_FMT} == "a.out")
         ${MAKEDIRTARGET} libexec/ld.aout_so ${targ}          ${MAKEDIRTARGET} libexec/ld.aout_so ${targ}
Line 344  do-ld.so: .PHONY
Line 408  do-ld.so: .PHONY
 .endif  .endif
 .endfor  .endfor
   
 do-build: .PHONY  do-build: .PHONY .MAKE
 .for targ in dependall install  .for targ in dependall install
         ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no          ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
 .endfor  .endfor
   
 do-x11: .PHONY  do-x11: .PHONY .MAKE
   .if ${MKXORG} != "no"
           ${MAKEDIRTARGET} external/mit/xorg build
   .else
         ${MAKEDIRTARGET} x11 build          ${MAKEDIRTARGET} x11 build
   .endif
   
 do-obsolete: .PHONY  do-obsolete: .PHONY .MAKE
         ${MAKEDIRTARGET} etc install-obsolete-lists          ${MAKEDIRTARGET} etc install-obsolete-lists
   
 #  #
Line 390  ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
Line 458  ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
 #  #
 # Display current make(1) parameters  # Display current make(1) parameters
 #  #
 params: .PHONY  params: .PHONY .MAKE
         ${MAKEDIRTARGET} etc params          ${MAKEDIRTARGET} etc params

Legend:
Removed from v.1.234  
changed lines
  Added in v.1.256

CVSweb <webmaster@jp.NetBSD.org>