[src/trunk]: src/external/gpl3/binutils fix previous

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/58649809ba1a
branches:  trunk
changeset: 784921:58649809ba1a
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 14 03:36:44 2013 +0000

description:
fix previous

diffstat:

 external/gpl3/binutils/usr.bin/common/Makefile.prog |  14 ++++----------
 external/gpl3/binutils/usr.bin/gas/Makefile         |  18 +++++-------------
 external/gpl3/binutils/usr.bin/ld/Makefile          |  11 +++--------
 external/gpl3/binutils/usr.sbin/dbsym/Makefile      |  15 ++++++---------
 external/gpl3/binutils/usr.sbin/mdsetimage/Makefile |  15 +++++++--------
 5 files changed, 25 insertions(+), 48 deletions(-)

diffs (173 lines):

diff -r dc4c5b4a2f46 -r 58649809ba1a external/gpl3/binutils/usr.bin/common/Makefile.prog
--- a/external/gpl3/binutils/usr.bin/common/Makefile.prog       Thu Feb 14 03:02:47 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.prog       Thu Feb 14 03:36:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.prog,v 1.4 2013/02/14 02:52:59 matt Exp $
+#      $NetBSD: Makefile.prog,v 1.5 2013/02/14 03:36:44 christos Exp $
 #
 # Common Makefile fragment for a binutils program.
 #
@@ -24,21 +24,15 @@
 DPADD+=                ${LIBINTL}
 
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
-OPCODESOBJ!=   cd ${TOP}/${BFDSUBDIR}/libopcodes && ${PRINTOBJDIR}
-LDADD+=                -L${OPCODESOBJ} -lopcodes
-PROGDPLIBS+=   -lopcodes ${OPCODEOBJ}
+PROGDPLIBS+=   opcodes ${TOP}/${BFDSUBDIR}/libopcodes
 .endif
 
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*)
-BFDOBJ!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
-LDADD+=                -L${BFDOBJ} -lbfd
-PROGDPLIBS+=   -lbfd ${BFDOBJ}
+PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
 .endif
 
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libiberty*)
-IBERTYOBJ!=    cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
-LDADD+=                -L${IBERTYOBJ} -liberty
-DPADD+=                ${IBERTYOBJ}/libiberty.a
+PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
 .endif
 
 .PATH: ${DIST}/binutils ${DIST}/binutils/doc
diff -r dc4c5b4a2f46 -r 58649809ba1a external/gpl3/binutils/usr.bin/gas/Makefile
--- a/external/gpl3/binutils/usr.bin/gas/Makefile       Thu Feb 14 03:02:47 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/gas/Makefile       Thu Feb 14 03:36:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2013/02/14 02:52:59 matt Exp $
+#      $NetBSD: Makefile,v 1.8 2013/02/14 03:36:44 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -24,21 +24,13 @@
 CPPFLAGS+=     -I${DIST}/gas -I${DIST}/gas/config
 CPPFLAGS+=     -I${DIST}
 
+PROGDPLIBS+=   opcodes ${TOP}/${BFDSUBDIR}/libopcodes
+PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
+
 LDADD=         -lintl
 DPADD=         ${LIBINTL}
 
-OPCODESOBJ!=   cd ${TOP}/${BFDSUBDIR}/libopcodes && ${PRINTOBJDIR}
-LDADD+=                -L${OPCODESOBJ} -lopcodes
-PROGDPLIBS+=   -lopcodes ${OPCODESOBJ}
-
-BFDOBJ!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
-LDADD+=                -L${BFDOBJ} -lbfd
-PROGDPLIBS+=   -lbfd ${BFDOBJ}
-
-IBERTYOBJ!=    cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
-LDADD+=                -L${IBERTYOBJ} -liberty
-DPADD+=                ${IBERTYOBJ}/libiberty.a
-
 TEXINFO=       as.texinfo
 COMMONOBJDIR!= cd ${TOP}/usr.bin/common && ${PRINTOBJDIR}
 INFOFLAGS=     -I${DIST}/gas/doc -I${COMMONOBJDIR} -I${DIST}/libiberty
diff -r dc4c5b4a2f46 -r 58649809ba1a external/gpl3/binutils/usr.bin/ld/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/Makefile        Thu Feb 14 03:02:47 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile        Thu Feb 14 03:36:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2013/02/14 02:52:59 matt Exp $
+#      $NetBSD: Makefile,v 1.15 2013/02/14 03:36:44 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -25,13 +25,8 @@
 
 COPTS.ldgram.c = -Wno-stack-protector
 
-BFDOBJ!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
-LDADD+=                -L${BFDOBJ} -lbfd
-PROGDPLIBS+=   -lbfd ${BFDOBJ}
-
-IBERTYOBJ!=    cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
-LDADD+=                -L${IBERTYOBJ} -liberty
-DPADD+=                ${IBERTYOBJ}/libiberty.a
+PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
 
 TEXINFO=       ${G_TEXINFOS}
 COMMONOBJDIR!= cd ${TOP}/usr.bin/common && ${PRINTOBJDIR}
diff -r dc4c5b4a2f46 -r 58649809ba1a external/gpl3/binutils/usr.sbin/dbsym/Makefile
--- a/external/gpl3/binutils/usr.sbin/dbsym/Makefile    Thu Feb 14 03:02:47 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/dbsym/Makefile    Thu Feb 14 03:36:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2013/02/14 02:52:59 matt Exp $
+#      $NetBSD: Makefile,v 1.6 2013/02/14 03:36:44 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -12,24 +12,21 @@
 PROG=          dbsym
 MAN=           dbsym.8
 
-CPPFLAGS+=     -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
+CPPFLAGS+=     -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
 
 .if !defined(HOSTPROG)
-PROGDPLIBS+=   -lbfd ${BFDDIR}
+PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
 .else
+CPPFLAGS+=     -I${BFDDIR}
 DPADD+=                ${BFDDIR}/libbfd.a
-.endif
 LDADD+=                -L${BFDDIR} -lbfd
-
 DPADD+=                ${IBERTYDIR}/libiberty.a
 LDADD+=                -L${IBERTYDIR} -liberty
+.endif
 
 .ifndef HOSTPROG
 .include       "${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH}/defs.mk"
-
-BFDDIR!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
-IBERTYDIR!=    cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
-
 CPPFLAGS+=     -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
 LDADD+=                -lintl
 DPADD+=                ${LIBINTL}
diff -r dc4c5b4a2f46 -r 58649809ba1a external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
--- a/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile       Thu Feb 14 03:02:47 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile       Thu Feb 14 03:36:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2013/02/14 02:52:59 matt Exp $
+#      $NetBSD: Makefile,v 1.6 2013/02/14 03:36:44 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -12,24 +12,23 @@
 PROG=          mdsetimage
 MAN=           mdsetimage.8
 
-CPPFLAGS+=     -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
+CPPFLAGS+=     -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
 
 .if !defined(HOSTPROG)
-PROGDPLIBS+=   -lbfd ${BFDDIR}
+PROGDPLIBS+=   bfd ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+=   iberty ${TOP}/${BFDSUBDIR}/libiberty
 .else
 DPADD+=                ${BFDDIR}/libbfd.a
-.endif
 LDADD+=                -L${BFDDIR} -lbfd
-
 DPADD+=                ${IBERTYDIR}/libiberty.a
 LDADD+=                -L${IBERTYDIR} -liberty
+CPPFLAGS+=     -I${BFDDIR}
+.endif
+
 
 .ifndef HOSTPROG
 .include       "${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH}/defs.mk"
 
-BFDDIR!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
-IBERTYDIR!=    cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
-
 CPPFLAGS+=     -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
 LDADD+=                -lintl
 DPADD+=                ${LIBINTL}