Removed invasion into these makefiles by the "legacy" stuff;

I have a better fix in the works.

12 files changed, 36 insertions, 48 deletions

diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 416c8fe9bea7..69888570e686 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -9,10 +9,9 @@ SRCS=	addr2line.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index 8faeb8a4974d..d1e6493954fd 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -10,10 +10,9 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
 NOSHARED?= yes
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index 5c2d770f5ae0..ccd94ab226c5 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -20,10 +20,9 @@ CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/..
 CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\" 
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 NOSHARED?=	yes
-DPADD:=	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${RELTOP}/libopcodes/libopcodes.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+DPADD+=	${RELTOP}/libopcodes/libopcodes.a
 LDADD=	${DPADD}
 
 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 9b55fd1c767f..c75950e1e1c6 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -15,9 +15,8 @@ CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
 NOSHARED?= yes
-DPADD:=	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 CLEANDIRS+=	ldscripts
 CLEANFILES+=	ldemul-list.h stringify.sed
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index a98d92bc4940..ef2f2d68e6e9 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -10,10 +10,9 @@ WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/bfd
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index 98f4b0ca47b0..dfa04f520c62 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -9,10 +9,9 @@ SRCS=	objcopy.c not-strip.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index 2db70f3189e0..4a1d6a37de9e 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -10,11 +10,10 @@ WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libopcodes/libopcodes.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libopcodes/libopcodes.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index 2420e5872b56..960b130d548d 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -10,10 +10,9 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
 NOSHARED?= yes
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index 7140826dd58a..96012463f056 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile
+++ b/gnu/usr.bin/binutils/readelf/Makefile
@@ -12,10 +12,9 @@ SRCS=	${PROG}.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils
 
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index b502c472a12a..a0ef3171ed40 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -9,10 +9,9 @@ SRCS=	size.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index 0da55c4ea613..346e59fcf978 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -9,10 +9,9 @@ SRCS=	strings.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index 693e13b7f2a2..c059b4bace12 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -9,10 +9,9 @@ SRCS=	objcopy.c is-strip.c
 WARNS=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-DPADD:=	${RELTOP}/libbinutils/libbinutils.a \
-	${RELTOP}/libbfd/libbfd.a \
-	${RELTOP}/libiberty/libiberty.a \
-	${DPADD}
+DPADD=	${RELTOP}/libbinutils/libbinutils.a
+DPADD+=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
 CLEANFILES+=	maybe_stripped