diff options
| author | skrll <skrll@NetBSD.org> | 2009-09-08 07:08:00 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2009-09-08 07:08:00 +0000 |
| commit | 8a770313a30c7048cbda990883a7d35ca45fbe8d (patch) | |
| tree | 365e569529a8fc921c7c5f635c48873f7d260a41 /gnu | |
| parent | 68aba25e22914823783ce6b8b8fe6a470a71aa2a (diff) | |
Rename MKBFD to MKBINUTILS and support HAVE_BINUTILS for set lists. This
makes {MK,HAVE_}BINUTILS consistent with {MK,HAVE_}{GCC,GDB}.
Allow MKBFD to defines MKBINUTILS as a backwards compatibility hook.
Update the sets lists and add conditionals for lib{bfd,opcodes}.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.sbin/dbsym/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.sbin/mdsetimage/Makefile | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 89f0c75cb60..45c2ae49d9a 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2009/08/18 15:11:25 skrll Exp $ +# $NetBSD: Makefile,v 1.44 2009/09/08 07:08:02 skrll Exp $ .include <bsd.own.mk> -.if ${MKBFD} != "no" +.if ${MKBINUTILS} != "no" .if ${HAVE_BINUTILS} == "216" SUBDIR+= libopcodes libbfd libiberty .endif diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile index 3202ac9570b..f336e857b16 100644 --- a/gnu/usr.bin/binutils/Makefile +++ b/gnu/usr.bin/binutils/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2003/12/04 09:29:33 mrg Exp $ +# $NetBSD: Makefile,v 1.23 2009/09/08 07:08:02 skrll Exp $ .include <bsd.own.mk> -.if ${MKBFD} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk) +.if ${MKBINUTILS} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk) .include "${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk" #SUBDIR= libopcodes libbfd libiberty .WAIT @@ -10,6 +10,6 @@ SSUBDIR+= common gas gprof ld ${G_PROGRAMS:C/-new$//:C/sysdump//:C/srconv//:cxxfilt=c++filt} SUBDIR+= ${SSUBDIR:O} # alphabetize -.endif # MKBFD != no +.endif # MKBINUTILS != no .include <bsd.subdir.mk> diff --git a/gnu/usr.sbin/dbsym/Makefile b/gnu/usr.sbin/dbsym/Makefile index 75b17cf23bc..ee6624d8864 100644 --- a/gnu/usr.sbin/dbsym/Makefile +++ b/gnu/usr.sbin/dbsym/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2004/01/03 14:04:27 lukem Exp $ +# $NetBSD: Makefile,v 1.14 2009/09/08 07:08:02 skrll Exp $ .include <bsd.own.mk> .if (defined(HOSTPROG) && \ (${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \ - ${MKBFD} != "no" + ${MKBINUTILS} != "no" TOP= ${NETBSDSRCDIR}/gnu DIST= ${TOP}/dist/binutils BFDSUBDIR= lib @@ -34,6 +34,6 @@ CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES} LDADD+= -lintl DPADD+= ${LIBINTL} .endif # HOSTPROG -.endif # MKBFD != no +.endif # MKBINUTILS != no .include <bsd.prog.mk> diff --git a/gnu/usr.sbin/mdsetimage/Makefile b/gnu/usr.sbin/mdsetimage/Makefile index 1b7f7a92734..1d20bcf4d57 100644 --- a/gnu/usr.sbin/mdsetimage/Makefile +++ b/gnu/usr.sbin/mdsetimage/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.19 2008/02/09 02:37:21 mrg Exp $ +# $NetBSD: Makefile,v 1.20 2009/09/08 07:08:02 skrll Exp $ .include <bsd.own.mk> .if (defined(HOSTPROG) && \ (${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \ - ${MKBFD} != "no" + ${MKBINUTILS} != "no" TOP= ${NETBSDSRCDIR}/gnu DIST= ${TOP}/dist/binutils BFDSUBDIR= lib @@ -34,6 +34,6 @@ CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES} LDADD+= -lintl DPADD+= ${LIBINTL} .endif # HOSTPROG -.endif # MKBFD != no +.endif # MKBINUTILS != no .include <bsd.prog.mk> |
