summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorplunky <plunky@NetBSD.org>2010-12-03 21:38:46 +0000
committerplunky <plunky@NetBSD.org>2010-12-03 21:38:46 +0000
commitf33b316b63bc65b644be1d8aec0bb8bcecfffea8 (patch)
tree26f63fdc6a7ab29a5d0819116a0f1c4fc6bcc6af /Makefile
parent65b45bb0d8a48432bf75be2ea872fd45b6e87f15 (diff)
Remove the do-external-lib and do-gnu-lib targets, along with
external/lib/Makefile and crypto/external/lib/Makefile, replacing them all with SUBDIRs directly from lib/Makefile. compat/compatsubdirs.mk becomes simpler now, as everything is built from lib/Makefile, meaning all the libraries will now be built under compat so update the set lists to account for that.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e871de1b957..8f8b4c75ef2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.280 2010/11/28 18:40:54 skrll Exp $
+# $NetBSD: Makefile,v 1.281 2010/12/03 21:38:46 plunky Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -91,8 +91,6 @@
# external/bsd/pcc/libpcc.
# do-lib-libc: builds and installs prerequisites from lib/libc.
# do-lib: builds and installs prerequisites from lib.
-# do-gnu-lib: builds and installs prerequisites from gnu/lib.
-# do-external-lib: builds and installs prerequisites from external/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
@@ -240,7 +238,7 @@ BUILDTARGETS+= do-libgcc
BUILDTARGET+= do-libpcc
.endif
BUILDTARGETS+= do-lib-libc
-BUILDTARGETS+= do-lib do-gnu-lib do-external-lib
+BUILDTARGETS+= do-lib
.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
BUILDTARGETS+= do-sys-modules
.endif
@@ -419,7 +417,7 @@ 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 gnu/lib external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules
+.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
.for targ in dependall install
${MAKEDIRTARGET} ${dir} ${targ}
@@ -430,7 +428,7 @@ do-${dir:S/\//-/g}: .PHONY .MAKE
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
+.for targ in dependall install
${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}"
.endfor
.endfor