Sun Dec 13 09:29:27 2009 UTC ()
adjust the do-compat-* rules now that src/compat/lib and friends no longer exist


(mrg)
diff -r1.275 -r1.276 src/Makefile
cvs diff -r1.275 -r1.276 src/Makefile (expand / switch to unified diff)

--- src/Makefile 2009/11/30 16:13:22 1.275
+++ src/Makefile 2009/12/13 09:29:27 1.276
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.275 2009/11/30 16:13:22 uebayasi Exp $ 1# $NetBSD: Makefile,v 1.276 2009/12/13 09:29:27 mrg Exp $
2 2
3# 3#
4# This is the top-level makefile for building NetBSD. For an outline of 4# This is the top-level makefile for building NetBSD. For an outline of
5# how to build a snapshot or release, as well as other release engineering 5# how to build a snapshot or release, as well as other release engineering
6# information, see http://www.NetBSD.org/developers/releng/index.html 6# information, see http://www.NetBSD.org/developers/releng/index.html
7# 7#
8# Not everything you can set or do is documented in this makefile. In 8# Not everything you can set or do is documented in this makefile. In
9# particular, you should review the files in /usr/share/mk (especially 9# particular, you should review the files in /usr/share/mk (especially
10# bsd.README) for general information on building programs and writing 10# bsd.README) for general information on building programs and writing
11# Makefiles within this structure, and see the comments in src/etc/Makefile 11# Makefiles within this structure, and see the comments in src/etc/Makefile
12# for further information on installation and release set options. 12# for further information on installation and release set options.
13# 13#
14# Variables listed below can be set on the make command line (highest 14# Variables listed below can be set on the make command line (highest
@@ -404,39 +404,43 @@ do-distrib-dirs: .PHONY .MAKE @@ -404,39 +404,43 @@ do-distrib-dirs: .PHONY .MAKE
404.for targ in cleandir obj includes 404.for targ in cleandir obj includes
405do-${targ}: .PHONY ${targ} 405do-${targ}: .PHONY ${targ}
406 @true 406 @true
407.endfor 407.endfor
408 408
409.if defined(HAVE_GCC) 409.if defined(HAVE_GCC)
410BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT} 410BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
411BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT} 411BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}
412.elif defined(HAVE_PCC) 412.elif defined(HAVE_PCC)
413BUILD_CC_LIB+= external/bsd/pcc/crtstuff 413BUILD_CC_LIB+= external/bsd/pcc/crtstuff
414BUILD_CC_LIB+= external/bsd/pcc/libpcc 414BUILD_CC_LIB+= external/bsd/pcc/libpcc
415.endif 415.endif
416 416
417.if ${MKCOMPAT} != "no" 417.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/net/lib sys/modules
418BUILD_COMPAT_LIBS= compat/lib/csu ${BUILD_CC_LIB:S/^/compat\//} compat/lib/libc 
419.else 
420BUILD_COMPAT_LIBS= 
421.endif 
422 
423.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/net/lib sys/modules ${BUILD_COMPAT_LIBS} 
424do-${dir:S/\//-/g}: .PHONY .MAKE 418do-${dir:S/\//-/g}: .PHONY .MAKE
425.for targ in dependall install 419.for targ in dependall install
426 ${MAKEDIRTARGET} ${dir} ${targ} 420 ${MAKEDIRTARGET} ${dir} ${targ}
427.endfor 421.endfor
428.endfor 422.endfor
429 423
 424.if ${MKCOMPAT} != "no"
 425COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc
 426.for dir in ${COMPAT_SUBDIR_LIST}
 427do-compat-${dir:S/\//-/g}: .PHONY .MAKE
 428.for targ in obj dependall install
 429 ${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}"
 430.endfor
 431.endfor
 432.endif
 433
430do-top-obj: .PHONY .MAKE 434do-top-obj: .PHONY .MAKE
431 ${MAKEDIRTARGET} . obj NOSUBDIR= 435 ${MAKEDIRTARGET} . obj NOSUBDIR=
432 436
433do-tools-obj: .PHONY .MAKE 437do-tools-obj: .PHONY .MAKE
434 ${MAKEDIRTARGET} tools obj 438 ${MAKEDIRTARGET} tools obj
435 439
436do-libgcc: .PHONY .MAKE 440do-libgcc: .PHONY .MAKE
437.if defined(HAVE_GCC) 441.if defined(HAVE_GCC)
438.if ${MKGCC} != "no" 442.if ${MKGCC} != "no"
439.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4") 443.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
440 ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT} 444 ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
441.endif 445.endif
442 ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT} 446 ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}