diff options
| author | plunky <plunky@NetBSD.org> | 2010-12-03 21:38:46 +0000 |
|---|---|---|
| committer | plunky <plunky@NetBSD.org> | 2010-12-03 21:38:46 +0000 |
| commit | f33b316b63bc65b644be1d8aec0bb8bcecfffea8 (patch) | |
| tree | 26f63fdc6a7ab29a5d0819116a0f1c4fc6bcc6af /compat | |
| parent | 65b45bb0d8a48432bf75be2ea872fd45b6e87f15 (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 'compat')
| -rw-r--r-- | compat/compatsubdir.mk | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/compat/compatsubdir.mk b/compat/compatsubdir.mk index 432d063c35d..d533305f02a 100644 --- a/compat/compatsubdir.mk +++ b/compat/compatsubdir.mk @@ -1,4 +1,4 @@ -# $NetBSD: compatsubdir.mk,v 1.4 2010/11/02 16:34:33 joerg Exp $ +# $NetBSD: compatsubdir.mk,v 1.5 2010/12/03 21:38:48 plunky Exp $ # Build netbsd libraries. @@ -13,39 +13,11 @@ # XXX make this use MAKEOBJDIR MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} -# XXX fix the "library" list to include all 'external' libs? .if defined(BOOTSTRAP_SUBDIRS) SUBDIR= ${BOOTSTRAP_SUBDIRS} .else -SUBDIR= ../../../gnu/lib/crtstuff4 .WAIT \ - ../../../lib/csu .WAIT \ - ../../../gnu/lib/libgcc4 .WAIT \ - ../../../lib/libc .WAIT \ - ../../../lib/libutil .WAIT \ - ../../../lib .WAIT \ - ../../../gnu/lib \ - ../../../external/bsd/bind/lib \ - ../../../external/bsd/libevent/lib \ - ../../../external/bsd/file/lib \ - ../../../external/public-domain/xz/lib \ +SUBDIR= ../../../lib .WAIT \ ../../../libexec/ld.elf_so - -.if ${MKATF} != "no" -SUBDIR+= ../../../external/bsd/atf/lib -.endif - -.if (${MKLDAP} != "no") -SUBDIR+= ../../../external/bsd/openldap/lib -.endif - -.if (${MKBINUTILS} != "no") -SUBDIR+= ../../../external/gpl3/binutils/lib -.endif - -.if (${MKISCSI} != "no") -SUBDIR+= ../../../external/bsd/iscsi/lib -.endif - .endif .include <bsd.subdir.mk> |
