[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.262 and 1.262.2.3.4.1

version 1.262, 2008/10/27 22:32:51 version 1.262.2.3.4.1, 2009/12/14 06:40:41
Line 103 
Line 103 
 #   do-compat-lib-libc: builds and installs prerequisites from compat/lib/libc  #   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; 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 177  _POSTINSTALL= ${.CURDIR}/usr.sbin/postin
Line 177  _POSTINSTALL= ${.CURDIR}/usr.sbin/postin
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
         ${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 ==="
         ${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 ==="
         ${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 242  BUILDTARGETS+= do-compat-lib-libc
Line 242  BUILDTARGETS+= do-compat-lib-libc
 .endif  .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 397  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
   
 .if ${MKCOMPAT} != "no"  .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=      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}
 .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 obj 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 458  do-build: .PHONY .MAKE
Line 462  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.262  
changed lines
  Added in v.1.262.2.3.4.1
CVSweb <webmaster@jp.NetBSD.org>