[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.269 and 1.284

version 1.269, 2009/04/15 10:18:34 version 1.284, 2011/06/20 06:52:36
Line 87 
Line 87 
 #                    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 108 
 #   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 143  _SRC_TOP_OBJ_=
Line 145  _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 bin games libexec sbin usr.bin  _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  _SUBDIR+=       usr.sbin share rescue sys etc tests compat .WAIT distrib regress
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
Line 196  postinstall-fix-obsolete: .NOTMAIN .PHON
Line 199  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
   .else
   LIBGCC_EXT=45
 .endif  .endif
 .endif  .endif
   
Line 219  BUILDTARGETS+= do-tools
Line 222  BUILDTARGETS+= do-tools
 .if ${MKOBJDIRS} != "no"  .if ${MKOBJDIRS} != "no"
 BUILDTARGETS+=  obj  BUILDTARGETS+=  obj
 .endif  .endif
   BUILDTARGETS+=  clean_METALOG
 .if !defined(NODISTRIBDIRS)  .if !defined(NODISTRIBDIRS)
 BUILDTARGETS+=  do-distrib-dirs  BUILDTARGETS+=  do-distrib-dirs
 .endif  .endif
Line 234  BUILDTARGETS+= do-libgcc
Line 238  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
 BUILDTARGETS+=  do-sys-rump-fs-lib do-sys-rump-net-lib  .if ${MKKMOD} != "no"
 .if (${MACHINE} != "evbppc")  
 BUILDTARGETS+=  do-sys-modules  BUILDTARGETS+=  do-sys-modules
 .endif  .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"  .if ${MKCOMPAT} != "no"
 BUILDTARGETS+=  do-compat-lib-csu  BUILDTARGETS+=  do-compat-lib-csu
 BUILDTARGETS+=  do-compat-libgcc  BUILDTARGETS+=  do-compat-libgcc
Line 249  BUILDTARGETS+= do-build
Line 254  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 324  installworld: .PHONY .MAKE
Line 332  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
Line 381  check-tools: .PHONY
Line 389  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 394  do-${targ}: .PHONY ${targ}
Line 408  do-${targ}: .PHONY ${targ}
 .endfor  .endfor
   
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
   .if ${USE_COMPILERCRTSTUFF} == "yes"
 BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}  BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
   .endif
 BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}  BUILD_CC_LIB+= gnu/lib/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 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 423  do-tools-obj: .PHONY .MAKE
Line 443  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-gnu-lib-crtstuff${LIBGCC_EXT}
 .endif  .endif
         ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}          ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
Line 433  do-libgcc: .PHONY .MAKE
Line 453  do-libgcc: .PHONY .MAKE
 do-compat-libgcc: .PHONY .MAKE  do-compat-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)  .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
   .if ${USE_COMPILERCRTSTUFF} == "yes"
         ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}          ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}
   .endif
         ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}          ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}
 .endif  .endif
 .endif  .endif
Line 441  do-compat-libgcc: .PHONY .MAKE
Line 463  do-compat-libgcc: .PHONY .MAKE
 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 473  do-x11: .PHONY .MAKE
Line 492  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
   

Legend:
Removed from v.1.269  
changed lines
  Added in v.1.284

CVSweb <webmaster@jp.NetBSD.org>