[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.312 and 1.326

version 1.312, 2015/01/07 20:42:01 version 1.326, 2019/06/06 14:51:43
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 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-lib:          builds and installs prerequisites from lib  #   do-lib:          builds and installs prerequisites from lib.
 #                    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 137  _SRC_TOP_OBJ_=
Line 136  _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 .WAIT lib include external crypto/external bin
 _SUBDIR+=       libexec sbin usr.bin  _SUBDIR+=       games libexec sbin usr.bin
 _SUBDIR+=       usr.sbin share sys etc tests compat  _SUBDIR+=       usr.sbin share sys etc tests compat
 _SUBDIR+=       .WAIT rescue .WAIT distrib regress  _SUBDIR+=       .WAIT rescue .WAIT distrib regress
   
Line 164  afterinstall: .PHONY .MAKE
Line 163  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
Line 181  _POSTINSTALL_ENV= \
Line 180  _POSTINSTALL_ENV= \
         SED=${TOOL_SED: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 "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete_stand: .NOTMAIN .PHONY  postinstall-fix-obsolete_stand: .NOTMAIN .PHONY
         @echo "   === Removing obsolete files ==="          @echo "   === Removing obsolete files ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete_stand          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete_stand
         @echo "   ==============================="          @echo "   ==============================="
   
   
Line 234  BUILDTARGETS+= do-compat-lib
Line 237  BUILDTARGETS+= do-compat-lib
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
 .endif  .endif
   .if !defined(NOBINARIES)
 BUILDTARGETS+=  do-build  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 246  BUILDTARGETS+= do-obsolete
Line 251  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 478  do-build: .PHONY .MAKE
Line 482  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/tools all
         ${MAKEDIRTARGET} external/mit/xorg/lib build_install          ${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 524  dependall-distrib depend-distrib all-dis
Line 527  dependall-distrib depend-distrib all-dis
 .include <bsd.obj.mk>  .include <bsd.obj.mk>
 .include <bsd.kernobj.mk>  .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>  .include <bsd.subdir.mk>
   .include <bsd.clean.mk>

Legend:
Removed from v.1.312  
changed lines
  Added in v.1.326

CVSweb <webmaster@jp.NetBSD.org>