[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.224 and 1.230

version 1.224, 2004/01/04 00:27:15 version 1.230, 2004/02/06 23:12:56
Line 76 
Line 76 
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.  #   do-gnu-lib:      builds and installs prerequisites from gnu/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-obsolete:     installs the obsolete sets (for the postinstall-* targets).  #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #  #
   
Line 122  SUBDIR+= ${dir}
Line 123  SUBDIR+= ${dir}
 .endfor  .endfor
   
 .if exists(regress)  .if exists(regress)
 regression-tests:  regression-tests: .PHONY
         @echo Running regression tests...          @echo Running regression tests...
         @(cd ${.CURDIR}/regress && ${MAKE} regress)          @(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif  .endif
Line 131  regression-tests:
Line 132  regression-tests:
 NOPOSTINSTALL=  # defined  NOPOSTINSTALL=  # defined
 .endif  .endif
   
 afterinstall:  afterinstall: .PHONY
 .if ${MKMAN} != "no"  .if ${MKMAN} != "no"
         (cd ${.CURDIR}/share/man && ${MAKE} makedb)          (cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif  .endif
Line 142  afterinstall:
Line 143  afterinstall:
         (cd ${.CURDIR} && ${MAKE} postinstall-check)          (cd ${.CURDIR} && ${MAKE} postinstall-check)
 .endif  .endif
   
 postinstall-check:  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
         ${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check          ${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
         @echo "   ================================"          @echo "   ================================"
   
 postinstall-fix: .NOTMAIN  postinstall-fix: .NOTMAIN .PHONY
         @echo "   === Post installation fixes ==="          @echo "   === Post installation fixes ==="
         ${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix          ${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
         @echo "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete: .NOTMAIN  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} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
         @echo "   ==============================="          @echo "   ==============================="
Line 194  BUILDTARGETS+= do-lib-libdes
Line 195  BUILDTARGETS+= do-lib-libdes
 BUILDTARGETS+=  do-lib do-gnu-lib  BUILDTARGETS+=  do-lib do-gnu-lib
 BUILDTARGETS+=  do-ld.so  BUILDTARGETS+=  do-ld.so
 BUILDTARGETS+=  do-build  BUILDTARGETS+=  do-build
   .if ${MKX11} != "no"
   BUILDTARGETS+=  do-x11
   .endif
 BUILDTARGETS+=  do-obsolete  BUILDTARGETS+=  do-obsolete
   
 #  #
Line 201  BUILDTARGETS+= do-obsolete
Line 205  BUILDTARGETS+= do-obsolete
 #  #
   
 .ORDER:         ${BUILDTARGETS}  .ORDER:         ${BUILDTARGETS}
 includes-lib:   includes-include includes-sys  includes-lib:   .PHONY includes-include includes-sys
 includes-gnu:   includes-lib  includes-gnu:   .PHONY includes-lib
   
 #  #
 # Build the system and install into DESTDIR.  # Build the system and install into DESTDIR.
Line 210  includes-gnu: includes-lib
Line 214  includes-gnu: includes-lib
   
 START_TIME!=    date  START_TIME!=    date
   
 build:  build: .PHONY
 .if defined(BUILD_DONE)  .if defined(BUILD_DONE)
         @echo "Build already installed into ${DESTDIR}"          @echo "Build already installed into ${DESTDIR}"
 .else  .else
Line 218  build:
Line 222  build:
 .for tgt in ${BUILDTARGETS}  .for tgt in ${BUILDTARGETS}
         @(cd ${.CURDIR} && ${MAKE} ${tgt})          @(cd ${.CURDIR} && ${MAKE} ${tgt})
 .endfor  .endfor
           (cd ${.CURDIR}/etc && ${MAKE} install-etc-release)
         @echo   "Build started at:  ${START_TIME}"          @echo   "Build started at:  ${START_TIME}"
         @printf "Build finished at: " && date          @printf "Build finished at: " && date
 .endif  .endif
Line 227  build:
Line 232  build:
 # ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /  # ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
 #  #
   
 distribution buildworld:  distribution buildworld: .PHONY
 .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 251  distribution buildworld:
Line 256  distribution buildworld:
 HOST_UNAME_S!=  uname -s  HOST_UNAME_S!=  uname -s
 HOST_UNAME_M!=  uname -m  HOST_UNAME_M!=  uname -m
   
 installworld:  installworld: .PHONY
 .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 279  installworld:
Line 284  installworld:
 #  #
   
 .for tgt in sets sourcesets  .for tgt in sets sourcesets
 ${tgt}:  ${tgt}: .PHONY
         (cd ${.CURDIR}/distrib/sets && ${MAKE} $@)          (cd ${.CURDIR}/distrib/sets && ${MAKE} $@)
 .endfor  .endfor
   
Line 289  ${tgt}:
Line 294  ${tgt}:
 # are made.  # are made.
 #  #
   
 release snapshot:  release snapshot: .PHONY
         (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)          (cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
         (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)          (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)
         @echo   "make ${.TARGET} started at:  ${START_TIME}"          @echo   "make ${.TARGET} started at:  ${START_TIME}"
Line 299  release snapshot:
Line 304  release snapshot:
 # Special components of the "make build" process.  # Special components of the "make build" process.
 #  #
   
 check-tools:  check-tools: .PHONY
 .if ${TOOLCHAIN_MISSING} != "no" && !defined(EXTERNAL_TOOLCHAIN)  .if ${TOOLCHAIN_MISSING} != "no" && !defined(EXTERNAL_TOOLCHAIN)
         @echo '*** WARNING:  Building on MACHINE=${MACHINE} with missing toolchain.'          @echo '*** WARNING:  Building on MACHINE=${MACHINE} with missing toolchain.'
         @echo '*** May result in a failed build or corrupt binaries!'          @echo '*** May result in a failed build or corrupt binaries!'
Line 310  check-tools:
Line 315  check-tools:
         @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'          @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif  .endif
   
 do-distrib-dirs:  do-distrib-dirs: .PHONY
 .if !defined(DESTDIR) || ${DESTDIR} == ""  .if !defined(DESTDIR) || ${DESTDIR} == ""
         (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)          (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
 .else  .else
Line 318  do-distrib-dirs:
Line 323  do-distrib-dirs:
 .endif  .endif
   
 .for targ in cleandir obj includes  .for targ in cleandir obj includes
 do-${targ}: ${targ}  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  .for dir in tools tools/compat lib/csu gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib
 do-${dir:S/\//-/g}:  do-${dir:S/\//-/g}: .PHONY
 .for targ in dependall install  .for targ in dependall install
         (cd ${.CURDIR}/${dir} && ${MAKE} ${targ})          (cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
 .endfor  .endfor
 .endfor  .endfor
   
 do-ld.so:  do-ld.so: .PHONY
 .for targ in dependall install  .for targ in dependall install
 .if (${OBJECT_FMT} == "a.out")  .if (${OBJECT_FMT} == "a.out")
         (cd ${.CURDIR}/libexec/ld.aout_so && ${MAKE} ${targ})          (cd ${.CURDIR}/libexec/ld.aout_so && ${MAKE} ${targ})
Line 339  do-ld.so:
Line 344  do-ld.so:
 .endif  .endif
 .endfor  .endfor
   
 do-build:  do-build: .PHONY
 .for targ in dependall install  .for targ in dependall install
         (cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no)          (cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no)
 .endfor  .endfor
   
 do-obsolete:  do-x11: .PHONY
           (cd ${.CURDIR}/x11 && ${MAKE} build)
   
   do-obsolete: .PHONY
         (cd ${.CURDIR}/etc && ${MAKE} install-obsolete-lists)          (cd ${.CURDIR}/etc && ${MAKE} install-obsolete-lists)
   
 #  #
Line 353  do-obsolete:
Line 361  do-obsolete:
 #  #
   
 .for dir in bin etc distrib games libexec regress sbin usr.sbin tools  .for dir in bin etc distrib games libexec regress sbin usr.sbin tools
 includes-${dir}:  includes-${dir}: .PHONY
         @true          @true
 .endfor  .endfor
 .for dir in etc distrib regress  .for dir in etc distrib regress
 install-${dir}:  install-${dir}: .PHONY
         @true          @true
 .endfor  .endfor
   
Line 365  install-${dir}:
Line 373  install-${dir}:
 # XXX this needs to change when distrib Makefiles are recursion compliant  # XXX this needs to change when distrib Makefiles are recursion compliant
 # XXX many distrib subdirs need "cd etc && make snap_pre snap_kern" first...  # XXX many distrib subdirs need "cd etc && make snap_pre snap_kern" first...
 #  #
 dependall-distrib depend-distrib all-distrib:  dependall-distrib depend-distrib all-distrib: .PHONY
         @true          @true
   
 .include <bsd.sys.mk>  .include <bsd.sys.mk>
Line 373  dependall-distrib depend-distrib all-dis
Line 381  dependall-distrib depend-distrib all-dis
 .include <bsd.kernobj.mk>  .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>  .include <bsd.subdir.mk>
   
 build-docs: ${.CURDIR}/BUILDING  build-docs: .PHONY ${.CURDIR}/BUILDING
 ${.CURDIR}/BUILDING: doc/BUILDING.mdoc  ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
           ${_MKMSG_CREATE} ${.TARGET}
         ${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@          ${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@
   
   
 #  #
 # Display current make(1) parameters  # Display current make(1) parameters
 #  #
 params:  params: .PHONY
 .for var in     BSDSRCDIR BSDOBJDIR BUILDID DESTDIR EXTERNAL_TOOLCHAIN \          (cd ${.CURDIR}/etc && ${MAKE} params)
                 KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \  
                 MACHINE MACHINE_ARCH MAKECONF MAKEFLAGS \  
                 MAKEOBJDIR MAKEOBJDIRPREFIX \  
                 MKOBJDIRS MKUNPRIVED MKUPDATE \  
                 RELEASEDIR TOOLCHAIN_MISSING TOOLDIR \  
                 USETOOLS  
 .if defined(${var})  
         @printf "%20s = '%-s'\n" ${var} ${${var}:Q}  
 .else  
         @printf "%20s = (undefined)\n" ${var}  
 .endif  
 .endfor  

Legend:
Removed from v.1.224  
changed lines
  Added in v.1.230

CVSweb <webmaster@jp.NetBSD.org>