[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.289.2.5 and 1.290

version 1.289.2.5, 2014/05/22 13:23:26 version 1.290, 2012/01/22 03:53:32
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 not the root directory if cross compiling.  #       is the not 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 87 
Line 87 
 #   do-top-obj:      creates the top level object directory.  #   do-top-obj:      creates the top level object directory.
 #   do-tools-obj:    creates object directories for the host toolchain.  #   do-tools-obj:    creates object directories for the host toolchain.
 #   do-tools:        builds host toolchain.  #   do-tools:        builds host toolchain.
 #   params:          record the values of variables that might affect the  
 #                    build.  
 #   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-tools-compat: builds the "libnbcompat" library; needed for some
   #                    random host tool programs in the source tree.
   #   do-lib-csu:      builds and installs prerequisites from lib/csu.
   #   do-libgcc:       builds and installs prerequisites from
   #                    gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
   #                    gnu/lib/libgcc${LIBGCC_EXT}.
   #   do-libpcc:       builds and install prerequisites from
   #                    external/bsd/pcc/crtstuff (if necessary) and
   #                    external/bsd/pcc/libpcc.
   #   do-lib-libc:     builds and installs prerequisites from lib/libc.
   #   do-lib:          builds and installs prerequisites from lib.
   #   do-sys-rump-dev-lib: builds and installs prerequisites from sys/rump/dev/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-modules:  builds and installs kernel modules (used by rump binaries)
   #   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".  #                    if ${MKCOMPAT} != "no".
 #   do-compat-lib:   builds and installs prerequisites from compat/lib  #   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".  #                    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 if ${MKX11} != "no"; either  #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
Line 139  _SRC_TOP_OBJ_=
Line 157  _SRC_TOP_OBJ_=
 #  #
 _SUBDIR=        tools lib include gnu external crypto/external bin games  _SUBDIR=        tools lib include gnu external crypto/external bin games
 _SUBDIR+=       libexec sbin usr.bin  _SUBDIR+=       libexec sbin usr.bin
 _SUBDIR+=       usr.sbin share sys etc tests compat  _SUBDIR+=       usr.sbin share rescue sys etc tests compat .WAIT distrib regress
 _SUBDIR+=       .WAIT rescue .WAIT distrib regress  
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
 .if "${dir}" == ".WAIT" \  .if "${dir}" == ".WAIT" \
Line 171  afterinstall: .PHONY .MAKE
Line 188  afterinstall: .PHONY .MAKE
 .endif  .endif
   
 _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall  _POSTINSTALL=   ${.CURDIR}/usr.sbin/postinstall/postinstall
 _POSTINSTALL_ENV= \  
         AWK=${TOOL_AWK:Q}               \  
         DB=${TOOL_DB:Q}                 \  
         HOST_SH=${HOST_SH:Q}            \  
         MAKE=${MAKE:Q}                  \  
         PWD_MKDB=${TOOL_PWD_MKDB:Q}     \  
         STAT=${TOOL_STAT:Q}  
   
 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          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 ==="
         ${_POSTINSTALL_ENV} ${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 ==="
         ${_POSTINSTALL_ENV} ${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 205  BUILD_CC_LIB_BASEDIR= gnu/lib
Line 215  BUILD_CC_LIB_BASEDIR= gnu/lib
 BUILD_CC_LIB_BASETARGET= gnu-lib  BUILD_CC_LIB_BASETARGET= gnu-lib
 .else  .else
 LIBGCC_EXT=  LIBGCC_EXT=
 BUILD_CC_LIB_BASEDIR= external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib  BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
 BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib  BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif  .endif
 .endif  .endif
Line 223  BUILDTARGETS+= do-tools-obj
Line 233  BUILDTARGETS+= do-tools-obj
 .endif  .endif
 BUILDTARGETS+=  do-tools  BUILDTARGETS+=  do-tools
 .endif # USETOOLS               # }  .endif # USETOOLS               # }
 BUILDTARGETS+=  params  
 .if ${MKOBJDIRS} != "no"  .if ${MKOBJDIRS} != "no"
 BUILDTARGETS+=  obj  BUILDTARGETS+=  obj
 .endif  .endif
Line 234  BUILDTARGETS+= do-distrib-dirs
Line 243  BUILDTARGETS+= do-distrib-dirs
 .if !defined(NOINCLUDES)  .if !defined(NOINCLUDES)
 BUILDTARGETS+=  includes  BUILDTARGETS+=  includes
 .endif  .endif
   BUILDTARGETS+=  do-tools-compat
   BUILDTARGETS+=  do-lib-csu
   .if ${MKGCC} != "no"
   BUILDTARGETS+=  do-libgcc
   .endif
   .if ${MKPCC} != "no"
   BUILDTARGET+=   do-libpcc
   .endif
   BUILDTARGETS+=  do-lib-libc
 BUILDTARGETS+=  do-lib  BUILDTARGETS+=  do-lib
 BUILDTARGETS+=  do-compat-lib  .if ${MKKMOD} != "no"
   BUILDTARGETS+=  do-sys-modules
   .endif
   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"
   BUILDTARGETS+=  do-compat-lib-csu
   BUILDTARGETS+=  do-compat-libgcc
   BUILDTARGETS+=  do-compat-lib-libc
   .endif
   BUILDTARGETS+=  do-ld.so
 BUILDTARGETS+=  do-build  BUILDTARGETS+=  do-build
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
Line 254  includes-lib: .PHONY includes-include in
Line 282  includes-lib: .PHONY includes-include in
 includes-gnu:   .PHONY includes-lib  includes-gnu:   .PHONY includes-lib
   
 #  #
 # Record the values of variables that might affect the build.  
 # If no values have changed, avoid updating the timestamp  
 # of the params file.  
 #  
 # This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.  
 #  
 .include "${NETBSDSRCDIR}/etc/Makefile.params"  
 CLEANDIRFILES+= params  
 params: .EXEC  
         ${_MKMSG_CREATE} params  
         @${PRINT_PARAMS} >${.TARGET}.new  
         @if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \  
                 : "params is unchanged" ; \  
                 rm ${.TARGET}.new ; \  
         else \  
                 : "params has changed or is new" ; \  
                 mv ${.TARGET}.new ${.TARGET} ; \  
         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 460  do-${targ}: .PHONY ${targ}
Line 462  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 do-tools: .PHONY .MAKE  .if defined(HAVE_GCC)
         ${MAKEDIRTARGET} tools build_install  .if ${USE_COMPILERCRTSTUFF} == "yes"
   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)
   BUILD_CC_LIB+= external/bsd/pcc/crtstuff
   BUILD_CC_LIB+= external/bsd/pcc/libpcc
   .endif
   
 do-lib: .PHONY .MAKE  .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
         ${MAKEDIRTARGET} lib build_install  do-${dir:S/\//-/g}: .PHONY .MAKE
   .for targ in dependall install
           ${MAKEDIRTARGET} ${dir} ${targ}
   .endfor
   .endfor
   
 do-compat-lib: .PHONY .MAKE  .if ${MKCOMPAT} != "no"
         ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"  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 475  do-top-obj: .PHONY .MAKE
Line 495  do-top-obj: .PHONY .MAKE
 do-tools-obj: .PHONY .MAKE  do-tools-obj: .PHONY .MAKE
         ${MAKEDIRTARGET} tools obj          ${MAKEDIRTARGET} tools obj
   
   do-libgcc: .PHONY .MAKE
   .if defined(HAVE_GCC)
   .if ${MKGCC} != "no"
   .if ${USE_COMPILERCRTSTUFF} == "yes"
           ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
   .endif
           ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
   .endif
   .endif
   
   do-compat-libgcc: .PHONY .MAKE
   .if defined(HAVE_GCC)
   .if ${MKGCC} != "no"
   .if ${USE_COMPILERCRTSTUFF} == "yes"
           ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
   .endif
           ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
   .endif
   .endif
   
   do-libpcc: .PHONY .MAKE
   .if defined(HAVE_PCC)
   .if ${MKPCC} != "no"
   .if ${USE_COMPILERCRTSTUFF} == "yes"
           ${MAKEDIRTARGET} . do-pcc-lib-crtstuff
   .endif
           ${MAKEDIRTARGET} . do-pcc-lib-libpcc
   .endif
   .endif
   
   do-ld.so: .PHONY .MAKE
   .for targ in dependall install
           ${MAKEDIRTARGET} libexec/ld.elf_so ${targ}
   .endfor
   
 do-build: .PHONY .MAKE  do-build: .PHONY .MAKE
 .for targ in dependall install  .for targ in dependall install
         ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no          ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
Line 508  do-obsolete: .PHONY .MAKE
Line 563  do-obsolete: .PHONY .MAKE
 # (Tells <bsd.subdir.mk> not to recurse for them.)  # (Tells <bsd.subdir.mk> not to recurse for them.)
 #  #
   
 .for dir in bin etc distrib games libexec regress sbin usr.bin usr.sbin tools  .for dir in bin etc distrib games libexec regress sbin usr.sbin tools
 includes-${dir}: .PHONY  includes-${dir}: .PHONY
         @true          @true
 .endfor  .endfor
Line 524  install-${dir}: .PHONY
Line 579  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
   #
   params: .PHONY .MAKE
           ${MAKEDIRTARGET} etc params

Legend:
Removed from v.1.289.2.5  
changed lines
  Added in v.1.290

CVSweb <webmaster@jp.NetBSD.org>