[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.272 and 1.289.2.1

version 1.272, 2009/07/03 22:20:27 version 1.289.2.1, 2012/04/17 00:01:35
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 87 
Line 97 
 #                    gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and  #                    gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
 #                    gnu/lib/libgcc${LIBGCC_EXT}.  #                    gnu/lib/libgcc${LIBGCC_EXT}.
 #   do-libpcc:       builds and install prerequisites from  #   do-libpcc:       builds and install prerequisites from
 #                    external/bsd/pcc/crtstuff and external/bsd/pcc/libpcc.  #                    external/bsd/pcc/crtstuff (if necessary) 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:          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-sys-rump-dev-lib: builds and installs prerequisites from sys/rump/dev/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-sys-rump-fs-lib:  builds and installs prerequisites from sys/rump/fs/lib
   #   do-sys-rump-kern-lib:  builds and installs prereq. from sys/rump/kern/lib
 #   do-sys-rump-net-lib: builds and installs prerequisites from sys/rump/net/lib  #   do-sys-rump-net-lib: builds and installs prerequisites from sys/rump/net/lib
 #   do-sys-modules:  builds and installs kernel modules (used by rump binaries)  #   do-sys-modules:  builds and installs kernel modules (used by rump binaries)
 #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.  #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.
Line 107 
Line 118 
 #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either  #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
 #                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"  #                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
 #                    or X11R6 from src/x11  #                    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 197  postinstall-fix-obsolete: .NOTMAIN .PHON
Line 209  postinstall-fix-obsolete: .NOTMAIN .PHON
 # Targets (in order!) called by "make build".  # Targets (in order!) called by "make build".
 #  #
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${HAVE_GCC} == "3"  .if ${HAVE_GCC} == "4"
 LIBGCC_EXT=3  
 .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  .endif
   
Line 236  BUILDTARGETS+= do-libgcc
Line 252  BUILDTARGETS+= do-libgcc
 BUILDTARGET+=   do-libpcc  BUILDTARGET+=   do-libpcc
 .endif  .endif
 BUILDTARGETS+=  do-lib-libc  BUILDTARGETS+=  do-lib-libc
 BUILDTARGETS+=  do-lib do-gnu-lib do-external-lib  BUILDTARGETS+=  do-lib
 .if (${MACHINE} != "evbppc")  .if ${MKKMOD} != "no"
 BUILDTARGETS+=  do-sys-modules  BUILDTARGETS+=  do-sys-modules
 .endif  .endif
 BUILDTARGETS+=  do-sys-rump-fs-lib do-sys-rump-net-lib  BUILDTARGETS+=  do-sys-rump-dev-lib do-sys-rump-fs-lib
   BUILDTARGETS+=  do-sys-rump-kern-lib do-sys-rump-net-lib
 .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 251  BUILDTARGETS+= do-build
Line 268  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 326  installworld: .PHONY .MAKE
Line 346  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 369  iso-image-source: .PHONY
Line 412  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 402  do-${targ}: .PHONY ${targ}
Line 463  do-${targ}: .PHONY ${targ}
 .endfor  .endfor
   
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}  .if ${USE_COMPILERCRTSTUFF} == "yes"
 BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}  BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT}
   .endif
   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
 .endif  .endif
   
 .if ${MKCOMPAT} != "no"  .for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules
 BUILD_COMPAT_LIBS=      compat/lib/csu ${BUILD_CC_LIB:S/^/compat\//} compat/lib/libc  
 .else  
 BUILD_COMPAT_LIBS=  
 .endif  
   
 .for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib crypto/external/lib sys/rump/fs/lib sys/rump/net/lib sys/modules ${BUILD_COMPAT_LIBS}  
 do-${dir:S/\//-/g}: .PHONY .MAKE  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
   
   .if ${MKCOMPAT} != "no"
   COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc
   .for dir in ${COMPAT_SUBDIR_LIST}
   do-compat-${dir:S/\//-/g}: .PHONY .MAKE
   .for targ in dependall install
           ${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}"
   .endfor
   .endfor
   .endif
   
 do-top-obj: .PHONY .MAKE  do-top-obj: .PHONY .MAKE
         ${MAKEDIRTARGET} . obj NOSUBDIR=          ${MAKEDIRTARGET} . obj NOSUBDIR=
   
Line 431  do-tools-obj: .PHONY .MAKE
Line 498  do-tools-obj: .PHONY .MAKE
 do-libgcc: .PHONY .MAKE  do-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
 .if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")  .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
   
 do-compat-libgcc: .PHONY .MAKE  do-compat-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
         ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}  .if ${USE_COMPILERCRTSTUFF} == "yes"
         ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}          ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
   .endif
           ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif  .endif
 .endif  .endif
   
 do-libpcc: .PHONY .MAKE  do-libpcc: .PHONY .MAKE
 .if defined(HAVE_PCC)  .if defined(HAVE_PCC)
 .if ${MKPCC} != "no"  .if ${MKPCC} != "no"
   .if ${USE_COMPILERCRTSTUFF} == "yes"
         ${MAKEDIRTARGET} . do-pcc-lib-crtstuff          ${MAKEDIRTARGET} . do-pcc-lib-crtstuff
   .endif
         ${MAKEDIRTARGET} . do-pcc-lib-libpcc          ${MAKEDIRTARGET} . do-pcc-lib-libpcc
 .endif  .endif
 .endif  .endif
   
 do-ld.so: .PHONY .MAKE  do-ld.so: .PHONY .MAKE
 .for targ in dependall install  .for targ in dependall install
 .if (${OBJECT_FMT} == "a.out")  
         ${MAKEDIRTARGET} libexec/ld.aout_so ${targ}  
 .endif  
 .if (${OBJECT_FMT} == "ELF")  
         ${MAKEDIRTARGET} libexec/ld.elf_so ${targ}          ${MAKEDIRTARGET} libexec/ld.elf_so ${targ}
 .endif  
 .endfor  .endfor
   
 do-build: .PHONY .MAKE  do-build: .PHONY .MAKE
Line 481  do-x11: .PHONY .MAKE
Line 547  do-x11: .PHONY .MAKE
         @false          @false
 .endif  .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 510  dependall-distrib depend-distrib all-dis
Line 584  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.272  
changed lines
  Added in v.1.289.2.1

CVSweb <webmaster@jp.NetBSD.org>