[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.252.4.1 and 1.252.4.2

version 1.252.4.1, 2008/06/23 04:26:43 version 1.252.4.2, 2008/09/18 04:27:24
Line 84 
Line 84 
 #   do-libgcc:       builds and installs prerequisites from  #   do-libgcc:       builds and installs prerequisites from
 #                    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
   #                    external/bsd/pcc/crtstuff 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-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-ld.so:        builds and installs prerequisites from libexec/ld.*_so.  #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.
 #   do-build:        builds and installs the entire system.  #   do-build:        builds and installs the entire system.
 #   do-x11:          builds and installs X11R6 from src/x11 if ${MKX11} != "no"  #   do-x11:          builds and installs X11; either
   #                    X11R7 from src/external/mit/xorg if ${MKORG} != "no"
   #                    or X11R6 from src/x11 if ${MKX11} != "no"
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).  #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #  #
   
Line 178  postinstall-fix-obsolete: .NOTMAIN .PHON
Line 183  postinstall-fix-obsolete: .NOTMAIN .PHON
 #  #
 # Targets (in order!) called by "make build".  # Targets (in order!) called by "make build".
 #  #
   .if defined(HAVE_GCC)
 .if ${HAVE_GCC} == "3"  .if ${HAVE_GCC} == "3"
 LIBGCC_EXT=3  LIBGCC_EXT=3
 .else  .else
 LIBGCC_EXT=4  LIBGCC_EXT=4
 .endif  .endif
   .endif
   
 BUILDTARGETS+=  check-tools  BUILDTARGETS+=  check-tools
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)  .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
Line 205  BUILDTARGETS+= do-lib-csu
Line 212  BUILDTARGETS+= do-lib-csu
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
 BUILDTARGETS+=  do-libgcc  BUILDTARGETS+=  do-libgcc
 .endif  .endif
   .if ${MKPCC} != "no"
   BUILDTARGET+=   do-libpcc
   .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
 BUILDTARGETS+=  do-ld.so  BUILDTARGETS+=  do-ld.so
 BUILDTARGETS+=  do-build  BUILDTARGETS+=  do-build
 .if ${MKX11} != "no"  .if ${MKX11} != "no" || ${MKXORG} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
 .endif  .endif
 BUILDTARGETS+=  do-obsolete  BUILDTARGETS+=  do-obsolete
Line 356  do-${targ}: .PHONY ${targ}
Line 367  do-${targ}: .PHONY ${targ}
         @true          @true
 .endfor  .endfor
   
 .for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib external/lib  .if defined(HAVE_GCC)
   BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
   BUILD_CC_LIB+= gnu/lib/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/libdes lib gnu/lib external/lib sys/rump/fs/lib
 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 364  do-${dir:S/\//-/g}: .PHONY .MAKE
Line 383  do-${dir:S/\//-/g}: .PHONY .MAKE
 .endfor  .endfor
   
 do-libgcc: .PHONY .MAKE  do-libgcc: .PHONY .MAKE
   .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"  .if ${MKGCC} != "no"
 .if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")  .if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
         ${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}
 .endif  .endif
   .endif
   
   do-libpcc: .PHONY .MAKE
   .if defined(HAVE_PCC)
   .if ${MKPCC} != "no"
           ${MAKEDIRTARGET} . do-pcc-lib-crtstuff
           ${MAKEDIRTARGET} . do-pcc-lib-libpcc
   .endif
   .endif
   
 do-ld.so: .PHONY .MAKE  do-ld.so: .PHONY .MAKE
 .for targ in dependall install  .for targ in dependall install
Line 387  do-build: .PHONY .MAKE
Line 416  do-build: .PHONY .MAKE
 .endfor  .endfor
   
 do-x11: .PHONY .MAKE  do-x11: .PHONY .MAKE
   .if ${MKXORG} != "no"
           ${MAKEDIRTARGET} external/mit/xorg build
   .elif ${MKX11} != "no"
         ${MAKEDIRTARGET} x11 build          ${MAKEDIRTARGET} x11 build
   .else
           @echo "Neither MKX11 or MKXORG is 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.252.4.1  
changed lines
  Added in v.1.252.4.2

CVSweb <webmaster@jp.NetBSD.org>