[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.300 and 1.320

version 1.300, 2012/11/04 11:02:11 version 1.320, 2017/12/06 19:27:56
Line 30 
Line 30 
 #   NOCLEANDIR, if defined, will avoid a `make cleandir' at the start  #   NOCLEANDIR, if defined, will avoid a `make cleandir' at the start
 #       of the `make build'.  #       of the `make build'.
 #   NOINCLUDES will avoid the `make includes' usually done by `make build'.  #   NOINCLUDES will avoid the `make includes' usually done by `make build'.
   #   NOBINARIES will not build binaries, only includes and libraries
 #  #
 #   See mk.conf(5) for more details.  #   See mk.conf(5) for more details.
 #  #
Line 64 
Line 65 
 #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs  #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
 #       from ${DESTDIR}  #       from ${DESTDIR}
 #   iso-image:  #   iso-image:
 #       Create CD-ROM image in RELEASEDIR/iso.  #       Create CD-ROM image in RELEASEDIR/images.
 #       RELEASEDIR must already have been populated by `make release'  #       RELEASEDIR must already have been populated by `make release'
 #       or equivalent.  #       or equivalent.
 #   iso-image-source:  #   iso-image-source:
 #       Create CD-ROM image with source in RELEASEDIR/iso.  #       Create CD-ROM image with source in RELEASEDIR/images.
 #       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:  #   live-image:
Line 92 
Line 93 
 #   obj:             creates object directories.  #   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  
 #                    random host tool programs in the source tree.  
 #   do-lib:          builds and installs prerequisites from lib  #   do-lib:          builds and installs prerequisites from lib
 #                    if ${MKCOMPAT} != "no".  #                    if ${MKCOMPAT} != "no".
 #   do-compat-lib:   builds and installs prerequisites from compat/lib  #   do-compat-lib:   builds and installs prerequisites from compat/lib
 #                    if ${MKCOMPAT} != "no".  #                    if ${MKCOMPAT} != "no".
   #   do-x11:          builds and installs X11 tools and libraries
   #                    from src/external/mit/xorg if ${MKX11} != "no".
 #   do-build:        builds and installs the entire system.  #   do-build:        builds and installs the entire system.
 #   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-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 139  _SRC_TOP_OBJ_=
Line 137  _SRC_TOP_OBJ_=
 # _SUBDIR is used to set SUBDIR, after removing directories that have  # _SUBDIR is used to set SUBDIR, after removing directories that have
 # BUILD_${dir}=no, or that have no ${dir}/Makefile.  # BUILD_${dir}=no, or that have no ${dir}/Makefile.
 #  #
 _SUBDIR=        tools lib include gnu external crypto/external bin games  _SUBDIR=        tools lib include external crypto/external bin games
 _SUBDIR+=       libexec sbin usr.bin  _SUBDIR+=       libexec sbin usr.bin
 _SUBDIR+=       usr.sbin share rescue sys etc tests compat .WAIT distrib regress  _SUBDIR+=       usr.sbin share sys etc tests compat
   _SUBDIR+=       .WAIT rescue .WAIT distrib regress
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
 .if "${dir}" == ".WAIT" \  .if "${dir}" == ".WAIT" \
Line 165  afterinstall: .PHONY .MAKE
Line 164  afterinstall: .PHONY .MAKE
         ${MAKEDIRTARGET} share/man makedb          ${MAKEDIRTARGET} share/man makedb
 .endif  .endif
 .if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")  .if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
         ${MAKEDIRTARGET} gnu/usr.bin/texinfo/install-info infodir-meta          ${MAKEDIRTARGET} external/gpl2/texinfo/bin/install-info infodir-meta
 .endif  .endif
 .if !defined(NOPOSTINSTALL)  .if !defined(NOPOSTINSTALL)
         ${MAKEDIRTARGET} . postinstall-check          ${MAKEDIRTARGET} . postinstall-check
 .endif  .endif
   
 _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall  _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall \
                   -m ${MACHINE} -a ${MACHINE_ARCH}
 _POSTINSTALL_ENV= \  _POSTINSTALL_ENV= \
         AWK=${TOOL_AWK:Q}               \          AWK=${TOOL_AWK:Q}               \
         DB=${TOOL_DB:Q}                 \          DB=${TOOL_DB:Q}                 \
         HOST_SH=${HOST_SH:Q}            \          HOST_SH=${HOST_SH:Q}            \
         MAKE=${MAKE:Q}                  \          MAKE=${MAKE:Q}                  \
         PWD_MKDB=${TOOL_PWD_MKDB:Q}     \          PWD_MKDB=${TOOL_PWD_MKDB:Q}     \
           SED=${TOOL_SED:Q}               \
         STAT=${TOOL_STAT:Q}          STAT=${TOOL_STAT:Q}
   
   .if ${MKX11} != "no"
   _POSTINSTALL_X11=-x ${X11SRCDIR:Q}
   .endif
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -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 ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix
         @echo "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete: .NOTMAIN .PHONY  postinstall-fix-obsolete: .NOTMAIN .PHONY
         @echo "   === Removing obsolete files ==="          @echo "   === Removing obsolete files ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete
           @echo "   ==============================="
   
   postinstall-fix-obsolete_stand: .NOTMAIN .PHONY
           @echo "   === Removing obsolete files ==="
           ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete_stand
         @echo "   ==============================="          @echo "   ==============================="
   
   
 #  #
 # Targets (in order!) called by "make build".  # Targets (in order!) called by "make build".
 #  #
 .if defined(HAVE_GCC)  
 .if ${HAVE_GCC} == "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  
   
 BUILDTARGETS+=  check-tools  BUILDTARGETS+=  check-tools
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)  .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=  cleandir  BUILDTARGETS+=  cleandir
Line 237  BUILDTARGETS+= includes
Line 235  BUILDTARGETS+= includes
 .endif  .endif
 BUILDTARGETS+=  do-lib  BUILDTARGETS+=  do-lib
 BUILDTARGETS+=  do-compat-lib  BUILDTARGETS+=  do-compat-lib
 BUILDTARGETS+=  do-build  .if !defined(NOBINARIES)
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
 .endif  .endif
   BUILDTARGETS+=  do-build
 .if ${MKEXTSRC} != "no"  .if ${MKEXTSRC} != "no"
 BUILDTARGETS+=  do-extsrc  BUILDTARGETS+=  do-extsrc
 .endif  .endif
 BUILDTARGETS+=  do-obsolete  BUILDTARGETS+=  do-obsolete
   .endif
   
 #  #
 # Enforce proper ordering of some rules.  # Enforce proper ordering of some rules.
Line 252  BUILDTARGETS+= do-obsolete
Line 252  BUILDTARGETS+= do-obsolete
   
 .ORDER:         ${BUILDTARGETS}  .ORDER:         ${BUILDTARGETS}
 includes-lib:   .PHONY includes-include includes-sys  includes-lib:   .PHONY includes-include includes-sys
 includes-gnu:   .PHONY includes-lib  
   
 #  #
 # Record the values of variables that might affect the build.  # Record the values of variables that might affect the build.
Line 261  includes-gnu: .PHONY includes-lib
Line 260  includes-gnu: .PHONY includes-lib
 #  #
 # This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.  # This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.
 #  #
   .include "${NETBSDSRCDIR}/etc/Makefile.params"
 CLEANDIRFILES+= params  CLEANDIRFILES+= params
 params: .EXEC  params: .EXEC
         ${_MKMSG_CREATE} params          ${_MKMSG_CREATE} params
         @(${MAKEDIRTARGET:S/^@//} etc params) >${.TARGET}.new          @${PRINT_PARAMS} >${.TARGET}.new
         @if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \          @if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \
                 : "params is unchanged" ; \                  : "params is unchanged" ; \
                 rm ${.TARGET}.new ; \                  rm ${.TARGET}.new ; \
Line 275  params: .EXEC
Line 274  params: .EXEC
         fi          fi
   
 #  #
   # Display current make(1) parameters
   #
   show-params: .PHONY .MAKE
           @${PRINT_PARAMS}
   
   #
 # Build the system and install into DESTDIR.  # Build the system and install into DESTDIR.
 #  #
   
Line 308  distribution buildworld: .PHONY .MAKE
Line 313  distribution buildworld: .PHONY .MAKE
         ${MAKEDIRTARGET} etc distribution INSTALL_DONE=1          ${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"  .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
         ${MAKEDIRTARGET} . postinstall-fix-obsolete          ${MAKEDIRTARGET} . postinstall-fix-obsolete
           ${MAKEDIRTARGET} . postinstall-fix-obsolete_stand
         ${MAKEDIRTARGET} distrib/sets checkflist          ${MAKEDIRTARGET} distrib/sets checkflist
 .endif  .endif
         @echo   "make ${.TARGET} started at:  ${START_TIME}"          @echo   "make ${.TARGET} started at:  ${START_TIME}"
Line 455  do-${targ}: .PHONY ${targ}
Line 461  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 .for dir in tools tools/compat  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-lib: .PHONY .MAKE  do-lib: .PHONY .MAKE
         ${MAKEDIRTARGET} lib build_install          ${MAKEDIRTARGET} lib build_install
Line 481  do-build: .PHONY .MAKE
Line 483  do-build: .PHONY .MAKE
   
 do-x11: .PHONY .MAKE  do-x11: .PHONY .MAKE
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 .if ${X11FLAVOUR} == "Xorg"          ${MAKEDIRTARGET} external/mit/xorg/tools all
         ${MAKEDIRTARGET} external/mit/xorg build          ${MAKEDIRTARGET} external/mit/xorg/lib build_install
 .else  .if ${MKCOMPATX11} != "no"
         ${MAKEDIRTARGET} x11 build          ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
 .endif  .endif
 .else  .else
         @echo "MKX11 is not enabled"          @echo "MKX11 is not enabled"
Line 523  install-${dir}: .PHONY
Line 525  install-${dir}: .PHONY
 dependall-distrib depend-distrib all-distrib: .PHONY  dependall-distrib depend-distrib all-distrib: .PHONY
         @true          @true
   
 .include <bsd.sys.mk>  
 .include <bsd.obj.mk>  .include <bsd.obj.mk>
 .include <bsd.kernobj.mk>  .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>  .include <bsd.subdir.mk>
   
 #  
 # Display current make(1) parameters  
 #  
 show-params: .PHONY .MAKE  
         ${MAKEDIRTARGET} etc params  

Legend:
Removed from v.1.300  
changed lines
  Added in v.1.320

CVSweb <webmaster@jp.NetBSD.org>