[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.298 and 1.299

version 1.298, 2012/08/15 12:50:12 version 1.299, 2012/08/17 16:22:27
Line 92 
Line 92 
 #   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
 #                    random host tool programs in the source tree.  #                    random host tool programs in the source tree.
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.  #   do-lib:          builds and installs prerequisites from lib
 #   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-libgcc: builds and installs prerequisites from  #   do-compat-lib:   builds and installs prerequisites from compat/lib
 #                    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 250  BUILDTARGETS+= do-distrib-dirs
Line 232  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
 .if ${MKKMOD} != "no"  BUILDTARGETS+=  do-compat-lib
 BUILDTARGETS+=  do-sys-modules  
 .endif  
 .if ${MKRUMP} != "no"  
 BUILDTARGETS+=  do-sys-rump-dev-lib do-sys-rump-fs-lib  
 BUILDTARGETS+=  do-sys-rump-kern-lib do-sys-rump-net-lib  
 .endif  
 .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 471  do-${targ}: .PHONY ${targ}
Line 432  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 .if defined(HAVE_GCC)  .for dir in tools tools/compat
 .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  
   
 .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  
 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"  do-lib: .PHONY .MAKE
 COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc          ${MAKEDIRTARGET} lib build_install
 .for dir in ${COMPAT_SUBDIR_LIST}  
 do-compat-${dir:S/\//-/g}: .PHONY .MAKE  do-compat-lib: .PHONY .MAKE
 .for targ in dependall install          ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"
         ${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 504  do-top-obj: .PHONY .MAKE
Line 451  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

Legend:
Removed from v.1.298  
changed lines
  Added in v.1.299

CVSweb <webmaster@jp.NetBSD.org>