[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / etc

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/etc/Makefile between version 1.323 and 1.324

version 1.323, 2006/02/15 21:59:08 version 1.324, 2006/02/17 22:09:33
Line 41 
Line 41 
 .include <bsd.kernobj.mk>       # For KERNSRCDIR, KERNOBJDIR, ...  .include <bsd.kernobj.mk>       # For KERNSRCDIR, KERNOBJDIR, ...
 .include <bsd.endian.mk>        # For TARGET_ENDIANNESS  .include <bsd.endian.mk>        # For TARGET_ENDIANNESS
   
 # XXX: .WAIT doesn't work the way this makefile needs it to.  
 # So until that is fixed.  
 # Actually that isn't enough either.... snap_pre must not depend on anything  
 .NOTPARALLEL:  
   
 .MAKEOVERRIDES+=        USETOOLS  .MAKEOVERRIDES+=        USETOOLS
   
 TZDIR=          /usr/share/zoneinfo  TZDIR=          /usr/share/zoneinfo
Line 141  PWD_MKDB_ENDIAN=
Line 136  PWD_MKDB_ENDIAN=
 # distribution --  # distribution --
 #       Build a distribution  #       Build a distribution
 #  #
 distribution: .PHONY .MAKE check_DESTDIR .WAIT distrib-dirs  distribution: .PHONY .MAKE check_DESTDIR distrib-dirs
 .if !defined(DISTRIBUTION_DONE)  .if !defined(DISTRIBUTION_DONE)
 .if !defined(INSTALL_DONE)  .if !defined(INSTALL_DONE)
         ${MAKEDIRTARGET} ${NETBSDSRCDIR} include _DISTRIB=          ${MAKEDIRTARGET} ${NETBSDSRCDIR} include _DISTRIB=
Line 392  distrib-dirs: .PHONY check_DESTDIR
Line 387  distrib-dirs: .PHONY check_DESTDIR
 # release, snapshot --  # release, snapshot --
 #       Build a full distribution including kernels & install media.  #       Build a full distribution including kernels & install media.
 #  #
 release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR .WAIT \  release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR snap_md_post
                     distribution .WAIT \  
                     snap_pre .WAIT snap_kern .WAIT \  
                     snap_post .WAIT snap_md_post  
         ${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets sets          ${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets sets
         ${MAKESUMS} -A -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets \          ${MAKESUMS} -A -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets \
                 ${KERNEL_SETS:@.SETS.@kern-${.SETS.}.tgz@}                  ${KERNEL_SETS:@.SETS.@kern-${.SETS.}.tgz@}
Line 413  CDROM.image=${RELEASEDIR}/${RELEASEMACHI
Line 405  CDROM.image=${RELEASEDIR}/${RELEASEMACHI
 CDROM.dir=      ${.OBJDIR}/cdrom.dir  CDROM.dir=      ${.OBJDIR}/cdrom.dir
 CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist  CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist
   
 iso-image: .PHONY check_DESTDIR check_RELEASEDIR .WAIT iso-image-md-post  iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
         ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'          ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
         @echo "iso-image created as: ${CDROM.image}"          @echo "iso-image created as: ${CDROM.image}"
   
Line 431  iso-image-setup: .PHONY check_RELEASEDIR
Line 423  iso-image-setup: .PHONY check_RELEASEDIR
 # iso-image-mi --  # iso-image-mi --
 #       Create the image after the MD operations have completed.  #       Create the image after the MD operations have completed.
 #  #
 iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR .WAIT \  iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre
                 iso-image-setup .WAIT iso-image-md-pre  
         @if ! ${MKISOFS} --version; then \          @if ! ${MKISOFS} --version; then \
                 echo "install pkgsrc/sysutils/cdrtools and run 'make iso-image'." ; \                  echo "install pkgsrc/sysutils/cdrtools and run 'make iso-image'." ; \
                 false; \                  false; \
Line 444  iso-image-mi: .PHONY check_DESTDIR check
Line 435  iso-image-mi: .PHONY check_DESTDIR check
 #       Setup ${CDROM.dir} to produce a bootable CD image.  #       Setup ${CDROM.dir} to produce a bootable CD image.
 #       Overridden by etc.$MACHINE/Makefile.inc  #       Overridden by etc.$MACHINE/Makefile.inc
 #  #
 iso-image-md-pre: .PHONY check_DESTDIR check_RELEASEDIR  iso-image-md-pre: .PHONY check_DESTDIR check_RELEASEDIR iso-image-setup
 #       (empty -- look in the machine-dependent Makefile.inc)  #       (empty -- look in the machine-dependent Makefile.inc)
   
 # iso-image-md-post --  # iso-image-md-post --
 #       Fixup the CD-image to be bootable.  #       Fixup the CD-image to be bootable.
 #       Overridden by etc.$MACHINE/Makefile.inc  #       Overridden by etc.$MACHINE/Makefile.inc
 #  #
 iso-image-md-post: .PHONY check_DESTDIR check_RELEASEDIR .WAIT iso-image-mi  iso-image-md-post: .PHONY check_DESTDIR check_RELEASEDIR iso-image-mi
 #       (empty -- look in the machine-dependent Makefile.inc)  #       (empty -- look in the machine-dependent Makefile.inc)
   
   
 # snap_pre --  # snap_pre --
 #       Create ${RELEASEDIR} and necessary subdirectories.  #       Create ${RELEASEDIR} and necessary subdirectories.
 #  #
 snap_pre: .PHONY # check_DESTDIR check_RELEASEDIR  snap_pre: .PHONY check_DESTDIR check_RELEASEDIR distribution
         ${INSTALL} -d -m 755 ${RELEASEDIR}          ${INSTALL} -d -m 755 ${RELEASEDIR}
 .if ${MKUPDATE} == "no"  .if ${MKUPDATE} == "no"
 # Could be a mount point, ignore the errors  # Could be a mount point, ignore the errors
Line 472  snap_pre: .PHONY # check_DESTDIR check_R
Line 463  snap_pre: .PHONY # check_DESTDIR check_R
 # snap_post --  # snap_post --
 #       Build the install media and notes from distrib  #       Build the install media and notes from distrib
 #  #
 snap_post: .PHONY .MAKE check_DESTDIR check_RELEASEDIR  snap_post: .PHONY .MAKE build_kernelsets build_releasekernels
 .if ${MKUPDATE} == "no"  .if ${MKUPDATE} == "no"
         cd ${NETBSDSRCDIR}/distrib && ${MAKE} cleandir          cd ${NETBSDSRCDIR}/distrib && ${MAKE} cleandir
 .endif  .endif
         cd ${NETBSDSRCDIR}/distrib && ${MAKE} depend && ${MAKE} && \          cd ${NETBSDSRCDIR}/distrib && ${MAKE} depend && ${MAKE} && \
             ${MAKE} release              ${MAKE} release
   
 # snap_kern --  # build kernels --
 #       This target builds the kernels specified by each port.  #       This target builds the kernels specified by each port.
 #       A port may specify the following kernels:  #       A port may specify the following kernels:
 #  #
Line 519  ALL_KERNELS?= ${KERNEL_SETS} ${EXTRA_KER
Line 510  ALL_KERNELS?= ${KERNEL_SETS} ${EXTRA_KER
 GETKERNELAWK=   awk '/^config/ {print $$2; found=1} \  GETKERNELAWK=   awk '/^config/ {print $$2; found=1} \
                 END{ if (found == 0) print "netbsd"; }'                  END{ if (found == 0) print "netbsd"; }'
   
 .if !target(snap_kern)                                          # {  build_kernels: .PHONY
   
 # build_kernels --  
 #       Configure & compile kernels listed in ${ALL_KERNELS}  #       Configure & compile kernels listed in ${ALL_KERNELS}
 #  #
 # The 'sync' is so that all writes during the build are pushed back  # The 'sync' is so that all writes during the build are pushed back
Line 530  GETKERNELAWK= awk '/^config/ {print $$2;
Line 519  GETKERNELAWK= awk '/^config/ {print $$2;
 #  #
 .if !defined(KERNELS_DONE)                                              # {  .if !defined(KERNELS_DONE)                                              # {
 .for configfile in ${ALL_KERNELS}                                       # {  .for configfile in ${ALL_KERNELS}                                       # {
 _KERNELS_TO_BUILD+=kern-${configfile}  build_kernels: kern-${configfile}
 kern-${configfile}: .PHONY .MAKE  kern-${configfile}: .PHONY .MAKE
         cd ${KERNCONFDIR} && ${TOOL_CONFIG} -s ${KERNSRCDIR} \          cd ${KERNCONFDIR} && ${TOOL_CONFIG} -s ${KERNSRCDIR} \
             -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}              -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
Line 542  kern-${configfile}: .PHONY .MAKE
Line 531  kern-${configfile}: .PHONY .MAKE
 .endfor # ALL_KERNELS                                                   # }  .endfor # ALL_KERNELS                                                   # }
 .endif  # KERNELS_DONE                                                  # }  .endif  # KERNELS_DONE                                                  # }
   
 build_kernels: .PHONY ${_KERNELS_TO_BUILD}  build_kernelsets: .PHONY
   
 # build_kernelsets --  
 #       Create kernel sets from ${KERNEL_SETS} into  #       Create kernel sets from ${KERNEL_SETS} into
 #       ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets  #       ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
 #  #
 .for configfile in ${KERNEL_SETS}                                       # {  .for configfile in ${KERNEL_SETS}                                       # {
 _KERNELSETS_TO_BUILD+=kernset-${configfile}  build_kernelsets: kernset-${configfile}
 kernset-${configfile}: .PHONY  kernset-${configfile}: .PHONY build_kernels snap_pre
         @ kernlist=`${GETKERNELAWK} ${KERNCONFDIR}/${configfile}`; \          @ kernlist=`${GETKERNELAWK} ${KERNCONFDIR}/${configfile}`; \
         kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \          kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
         kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \          kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
Line 578  kernset-${configfile}: .PHONY
Line 565  kernset-${configfile}: .PHONY
         }          }
 .endfor # KERNEL_SETS                                                   # }  .endfor # KERNEL_SETS                                                   # }
   
 build_kernelsets: ${_KERNELSETS_TO_BUILD}  build_releasekernels: .PHONY
   
 # build_releasekernels --  
 #       Build kernel.gz from ${KERNEL_SETS} ${EXTRA_KERNELS} into  #       Build kernel.gz from ${KERNEL_SETS} ${EXTRA_KERNELS} into
 #       ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel  #       ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel
 #  #
 .for configfile in ${KERNEL_SETS} ${EXTRA_KERNELS}                      # {  .for configfile in ${KERNEL_SETS} ${EXTRA_KERNELS}                      # {
 _RELEASEKERNELS_TO_BUILD+=releasekern-${configfile}  build_releasekernels: releasekern-${configfile}
 releasekern-${configfile}: .PHONY  releasekern-${configfile}: .PHONY build_kernels snap_pre
         @ kernlist=`${GETKERNELAWK} ${KERNCONFDIR}/${configfile:C/.*\///}`; \          @ kernlist=`${GETKERNELAWK} ${KERNCONFDIR}/${configfile:C/.*\///}`; \
         kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \          kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
         kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \          kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
Line 604  releasekern-${configfile}: .PHONY
Line 589  releasekern-${configfile}: .PHONY
         }          }
 .endfor # KERNEL_SETS EXTRA_KERNELS                                     # }  .endfor # KERNEL_SETS EXTRA_KERNELS                                     # }
   
 build_releasekernels: ${_RELEASEKERNELS_TO_BUILD}  
   
 # snap_kern --  
 #       build the kernels, then the sets & release kernels  
 #  
 snap_kern: .PHONY check_DESTDIR check_RELEASEDIR .WAIT \  
             build_kernels .WAIT \  
             build_kernelsets build_releasekernels  
   
 .endif # !target(snap_kern)                                     # }  
   
   
 # snap_md_post --  # snap_md_post --
 #       Machine dependent distribution media operations.  #       Machine dependent distribution media operations.
 #       Overridden by etc.$MACHINE/Makefile.inc  #       Overridden by etc.$MACHINE/Makefile.inc
 #  #
 snap_md_post: .PHONY check_DESTDIR check_RELEASEDIR  snap_md_post: .PHONY check_DESTDIR check_RELEASEDIR snap_post
 #       (empty -- look in the machine-dependent Makefile.inc)  #       (empty -- look in the machine-dependent Makefile.inc)
   
   
Legend:
Removed from v.1.323  
changed lines
  Added in v.1.324
CVSweb <webmaster@jp.NetBSD.org>