[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.261 and 1.263

version 1.261, 2008/10/25 15:03:44 version 1.263, 2008/11/09 23:02:28
Line 95 
Line 95 
 #   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-rump-net-lib: builds and installs prerequisites from sys/rump/net/lib
 #   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 136  _SRC_TOP_OBJ_=
Line 143  _SRC_TOP_OBJ_=
 # 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 bin games libexec sbin usr.bin
 _SUBDIR+=       usr.sbin share rescue sys etc tests .WAIT distrib regress  _SUBDIR+=       usr.sbin share rescue sys etc tests compat .WAIT distrib regress
   
 .for dir in ${_SUBDIR}  .for dir in ${_SUBDIR}
 .if "${dir}" == ".WAIT" \  .if "${dir}" == ".WAIT" \
Line 228  BUILDTARGET+= do-libpcc
Line 235  BUILDTARGET+= do-libpcc
 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 do-sys-rump-net-lib  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 385  BUILD_CC_LIB+= external/bsd/pcc/crtstuff
Line 397  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 sys/rump/net/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 sys/rump/fs/lib sys/rump/net/lib ${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}
Line 408  do-libgcc: .PHONY .MAKE
Line 426  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 432  do-build: .PHONY .MAKE
Line 458  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.261  
changed lines
  Added in v.1.263

CVSweb <webmaster@jp.NetBSD.org>