[src/trunk]: src/external/gpl3/binutils Use LIBDPLIBS

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

details:   https://anonhg.NetBSD.org/src/rev/d507ca14c291
branches:  trunk
changeset: 784916:d507ca14c291
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Feb 14 01:21:25 2013 +0000

description:
Use LIBDPLIBS

diffstat:

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

diffs (140 lines):

diff -r 4002c3dcfd7f -r d507ca14c291 external/gpl3/binutils/usr.bin/common/Makefile.prog
--- a/external/gpl3/binutils/usr.bin/common/Makefile.prog       Thu Feb 14 01:12:39 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.prog       Thu Feb 14 01:21:25 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.prog,v 1.2 2013/02/14 00:53:30 matt Exp $
+#      $NetBSD: Makefile.prog,v 1.3 2013/02/14 01:21:25 matt Exp $
 #
 # Common Makefile fragment for a binutils program.
 #
@@ -26,25 +26,13 @@
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
 OPCODESOBJ!=   cd ${TOP}/${BFDSUBDIR}/libopcodes && ${PRINTOBJDIR}
 LDADD+=                -L${OPCODESOBJ} -lopcodes
-.if ${MKPICLIB} != "no"
-DPADD+=                ${OPCODESOBJ}/libopcodes_pic.a
-.elif ${MKPIC} != "no"
-DPADD+=                ${OPCODESOBJ}/libopcodes.so
-.else
-DPADD+=                ${OPCODESOBJ}/libopcodes.a
-.endif
+LIBDPLIBS+=    -lopcodes ${OPCODEOBJ}
 .endif
 
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*)
 BFDOBJ!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
 LDADD+=                -L${BFDOBJ} -lbfd
-.if ${MKPICLIB} != "no"
-DPADD+=                ${BFDOBJ}/libbfd_pic.a
-.elif ${MKPIC} != "no"
-DPADD+=                ${BFDOBJ}/libbfd.so
-.else
-DPADD+=                ${BFDOBJ}/libbfd.a
-.endif
+LIBDPLIBS+=    -lbfd ${BFDOBJ}
 .endif
 
 .if !empty(G_${BUPROG}_DEPENDENCIES:M*/libiberty*)
diff -r 4002c3dcfd7f -r d507ca14c291 external/gpl3/binutils/usr.bin/gas/Makefile
--- a/external/gpl3/binutils/usr.bin/gas/Makefile       Thu Feb 14 01:12:39 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/gas/Makefile       Thu Feb 14 01:21:25 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2013/02/14 00:53:30 matt Exp $
+#      $NetBSD: Makefile,v 1.6 2013/02/14 01:21:25 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -29,23 +29,11 @@
 
 OPCODESOBJ!=   cd ${TOP}/${BFDSUBDIR}/libopcodes && ${PRINTOBJDIR}
 LDADD+=                -L${OPCODESOBJ} -lopcodes
-.if ${MKPICLIB} != "no"
-DPADD+=                ${OPCODESOBJ}/libopcodes_pic.a
-.elif ${MKPIC} != "no"
-DPADD+=                ${OPCODESOBJ}/libopcodes.so
-.else
-DPADD+=                ${OPCODESOBJ}/libopcodes.a
-.endif
+LIBDPLIBS+=    -lopcodes ${OPCODESOBJ}
 
 BFDOBJ!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
 LDADD+=                -L${BFDOBJ} -lbfd
-.if ${MKPICLIB} != "no"
-DPADD+=                ${BFDOBJ}/libbfd_pic.a
-.elif ${MKPIC} != "no"
-DPADD+=                ${BFDOBJ}/libbfd.so
-.else
-DPADD+=                ${BFDOBJ}/libbfd.a
-.endif
+LIBDPLIBS+=    -lbfd ${BFDOBJ}
 
 IBERTYOBJ!=    cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
 LDADD+=                -L${IBERTYOBJ} -liberty
diff -r 4002c3dcfd7f -r d507ca14c291 external/gpl3/binutils/usr.bin/ld/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/Makefile        Thu Feb 14 01:12:39 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile        Thu Feb 14 01:21:25 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2013/02/14 00:53:30 matt Exp $
+#      $NetBSD: Makefile,v 1.13 2013/02/14 01:21:25 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -27,13 +27,7 @@
 
 BFDOBJ!=       cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
 LDADD+=                -L${BFDOBJ} -lbfd
-.if ${MKPICLIB} != "no"
-DPADD+=                ${BFDOBJ}/libbfd_pic.a
-.elif ${MKPIC} != "no"
-DPADD+=                ${BFDOBJ}/libbfd.so
-.else
-DPADD+=                ${BFDOBJ}/libbfd.a
-.endif
+LIBDPLIBS+=    -lbfd ${BFDOBJ}
 
 IBERTYOBJ!=    cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
 LDADD+=                -L${IBERTYOBJ} -liberty
diff -r 4002c3dcfd7f -r d507ca14c291 external/gpl3/binutils/usr.sbin/dbsym/Makefile
--- a/external/gpl3/binutils/usr.sbin/dbsym/Makefile    Thu Feb 14 01:12:39 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/dbsym/Makefile    Thu Feb 14 01:21:25 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/02/14 00:53:31 matt Exp $
+#      $NetBSD: Makefile,v 1.4 2013/02/14 01:21:26 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -14,10 +14,8 @@
 
 CPPFLAGS+=     -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
 
-.if !defined(HOSTPROG) && ${MKPICLIB} != "no"
-DPADD+=                ${BFDDIR}/libbfd_pic.a
-.elif !defined(HOSTPROG) && ${MKPIC} != "no"
-DPADD+=                ${BFDDIR}/libbfd.so
+.if !defined(HOSTPROG)
+LIBDPLIBS+=    -lbfd ${BFDDIR}
 .else
 DPADD+=                ${BFDDIR}/libbfd.a
 .endif
diff -r 4002c3dcfd7f -r d507ca14c291 external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
--- a/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile       Thu Feb 14 01:12:39 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile       Thu Feb 14 01:21:25 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/02/14 00:53:31 matt Exp $
+#      $NetBSD: Makefile,v 1.4 2013/02/14 01:21:26 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -14,10 +14,8 @@
 
 CPPFLAGS+=     -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
 
-.if !defined(HOSTPROG) && ${MKPICLIB} != "no"
-DPADD+=                ${BFDDIR}/libbfd_pic.a
-.elif !defined(HOSTPROG) && ${MKPIC} != "no"
-DPADD+=                ${BFDDIR}/libbfd.so
+.if !defined(HOSTPROG)
+LIBDPLIBS+=    -lbfd ${BFDDIR}
 .else
 DPADD+=                ${BFDDIR}/libbfd.a
 .endif