[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.258 and 1.272

version 1.258, 2008/10/03 18:09:48 version 1.272, 2009/07/03 22:20:27
Line 74 
Line 74 
 #  #
 # Targets invoked by `make build,' in order:  # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.  #   cleandir:        cleans the tree.
 #   obj:             creates object directories.  #   do-top-obj:      creates the top level object directory.
   #   do-tools-obj:    creates object directories for the host toolchain.
 #   do-tools:        builds host toolchain.  #   do-tools:        builds host toolchain.
   #   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  #   do-tools-compat: builds the "libnbcompat" library; needed for some
Line 90 
Line 92 
 #   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-gnu-lib:      builds and installs prerequisites from gnu/lib.
 #   do-external-lib: builds and installs prerequisites from external/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-net-lib: builds and installs prerequisites from sys/rump/net/lib
   #   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.
   #   do-compat-lib-csu: builds and installs prerequisites from compat/lib/csu
   #                    if ${MKCOMPAT} != "no".
   #   do-compat-libgcc: builds and installs prerequisites from
   #                    compat/gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
   #                    compat/gnu/lib/libgcc${LIBGCC_EXT} if ${MKCOMPAT} != "no".
   #   do-compat-lib-libc: builds and installs prerequisites from compat/lib/libc
   #                    if ${MKCOMPAT} != "no".
 #   do-build:        builds and installs the entire system.  #   do-build:        builds and installs the entire system.
 #   do-x11:          builds and installs X11; either  #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
 #                    X11R7 from src/external/mit/xorg if ${MKXORG} != "no"  #                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
 #                    or X11R6 from src/x11 if ${MKX11} != "no"  #                    or X11R6 from src/x11
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).  #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #  #
   
Line 128  _SRC_TOP_OBJ_=
Line 139  _SRC_TOP_OBJ_=
 .endfor  .endfor
 .endif  .endif
   
 _SUBDIR=        tools lib include gnu external bin games libexec sbin usr.bin  
 _SUBDIR+=       usr.sbin share rescue sys etc tests .WAIT distrib regress  
   
 #  #
 # Weed out directories that don't exist.  # _SUBDIR is used to set SUBDIR, after removing directories that have
   # BUILD_${dir}=no, or that have no ${dir}/Makefile.
 #  #
   _SUBDIR=        tools lib include gnu external crypto/external bin games
   _SUBDIR+=       libexec sbin usr.bin
   _SUBDIR+=       usr.sbin share rescue sys etc tests compat .WAIT distrib regress
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
 .if ("${dir}" == ".WAIT") || exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")  .if "${dir}" == ".WAIT" \
           || (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile))
 SUBDIR+=        ${dir}  SUBDIR+=        ${dir}
 .endif  .endif
 .endfor  .endfor
Line 166  _POSTINSTALL= ${.CURDIR}/usr.sbin/postin
Line 179  _POSTINSTALL= ${.CURDIR}/usr.sbin/postin
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
         ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi          AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -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 ==="
         ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix          AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
         @echo "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete: .NOTMAIN .PHONY  postinstall-fix-obsolete: .NOTMAIN .PHONY
         @echo "   === Removing obsolete files ==="          @echo "   === Removing obsolete files ==="
         ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete          AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
         @echo "   ==============================="          @echo "   ==============================="
   
   
Line 196  BUILDTARGETS+= check-tools
Line 209  BUILDTARGETS+= check-tools
 BUILDTARGETS+=  cleandir  BUILDTARGETS+=  cleandir
 .endif  .endif
 .if ${MKOBJDIRS} != "no"  .if ${MKOBJDIRS} != "no"
 BUILDTARGETS+=  obj  BUILDTARGETS+=  do-top-obj
   .endif
   .if ${USETOOLS} == "yes"        # {
   .if ${MKOBJDIRS} != "no"
   BUILDTARGETS+=  do-tools-obj
 .endif  .endif
 .if ${USETOOLS} == "yes"  
 BUILDTARGETS+=  do-tools  BUILDTARGETS+=  do-tools
   .endif # USETOOLS               # }
   .if ${MKOBJDIRS} != "no"
   BUILDTARGETS+=  obj
 .endif  .endif
   BUILDTARGETS+=  clean_METALOG
 .if !defined(NODISTRIBDIRS)  .if !defined(NODISTRIBDIRS)
 BUILDTARGETS+=  do-distrib-dirs  BUILDTARGETS+=  do-distrib-dirs
 .endif  .endif
Line 217  BUILDTARGET+= do-libpcc
Line 237  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 do-gnu-lib do-external-lib
 BUILDTARGETS+=  do-sys-rump-fs-lib  .if (${MACHINE} != "evbppc")
   BUILDTARGETS+=  do-sys-modules
   .endif
   BUILDTARGETS+=  do-sys-rump-fs-lib do-sys-rump-net-lib
   .if ${MKCOMPAT} != "no"
   BUILDTARGETS+=  do-compat-lib-csu
   BUILDTARGETS+=  do-compat-libgcc
   BUILDTARGETS+=  do-compat-lib-libc
   .endif
 BUILDTARGETS+=  do-ld.so  BUILDTARGETS+=  do-ld.so
 BUILDTARGETS+=  do-build  BUILDTARGETS+=  do-build
 .if ${MKX11} != "no" || ${MKXORG} != "no"  .if ${MKX11} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
 .endif  .endif
 BUILDTARGETS+=  do-obsolete  BUILDTARGETS+=  do-obsolete
Line 355  check-tools: .PHONY
Line 383  check-tools: .PHONY
         @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'          @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif  .endif
   
   # Delete or sanitise a leftover METALOG from a previous build.
   clean_METALOG: .PHONY .MAKE
   .if ${MKUPDATE} != "no"
           ${MAKEDIRTARGET} distrib/sets clean_METALOG
   .endif
   
 do-distrib-dirs: .PHONY .MAKE  do-distrib-dirs: .PHONY .MAKE
 .if !defined(DESTDIR) || ${DESTDIR} == ""  .if !defined(DESTDIR) || ${DESTDIR} == ""
         ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/          ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
Line 375  BUILD_CC_LIB+= external/bsd/pcc/crtstuff
Line 409  BUILD_CC_LIB+= external/bsd/pcc/crtstuff
 BUILD_CC_LIB+= external/bsd/pcc/libpcc  BUILD_CC_LIB+= external/bsd/pcc/libpcc
 .endif  .endif
   
 .for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib sys/rump/fs/lib  .if ${MKCOMPAT} != "no"
   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
   
   do-top-obj: .PHONY .MAKE
           ${MAKEDIRTARGET} . obj NOSUBDIR=
   
   do-tools-obj: .PHONY .MAKE
           ${MAKEDIRTARGET} tools obj
   
 do-libgcc: .PHONY .MAKE  do-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
Line 392  do-libgcc: .PHONY .MAKE
Line 438  do-libgcc: .PHONY .MAKE
 .endif  .endif
 .endif  .endif
   
   do-compat-libgcc: .PHONY .MAKE
   .if defined(HAVE_GCC)
   .if ${MKGCC} != "no"
           ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}
           ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}
   .endif
   .endif
   
 do-libpcc: .PHONY .MAKE  do-libpcc: .PHONY .MAKE
 .if defined(HAVE_PCC)  .if defined(HAVE_PCC)
 .if ${MKPCC} != "no"  .if ${MKPCC} != "no"
Line 416  do-build: .PHONY .MAKE
Line 470  do-build: .PHONY .MAKE
 .endfor  .endfor
   
 do-x11: .PHONY .MAKE  do-x11: .PHONY .MAKE
 .if ${MKXORG} != "no"  .if ${MKX11} != "no"
   .if ${X11FLAVOUR} == "Xorg"
         ${MAKEDIRTARGET} external/mit/xorg build          ${MAKEDIRTARGET} external/mit/xorg build
 .elif ${MKX11} != "no"  .else
         ${MAKEDIRTARGET} x11 build          ${MAKEDIRTARGET} x11 build
   .endif
 .else  .else
         @echo "Neither MKX11 or MKXORG is enabled"          @echo "MKX11 is not enabled"
         @false          @false
 .endif  .endif
   

Legend:
Removed from v.1.258  
changed lines
  Added in v.1.272

CVSweb <webmaster@jp.NetBSD.org>