Module Name: src
Committed By: matt
Date: Thu Feb 14 02:53:00 UTC 2013
Modified Files:
src/external/gpl3/binutils/usr.bin/common: Makefile.prog
src/external/gpl3/binutils/usr.bin/gas: Makefile
src/external/gpl3/binutils/usr.bin/ld: Makefile
src/external/gpl3/binutils/usr.sbin/dbsym: Makefile
src/external/gpl3/binutils/usr.sbin/mdsetimage: Makefile
Log Message:
Use PROGDPLIBS
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/usr.bin/common/Makefile.prog
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/usr.bin/gas/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/binutils/usr.bin/ld/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.prog
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.3 src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.4
--- src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.3 Thu Feb 14 01:21:25 2013
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.prog Thu Feb 14 02:52:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.prog,v 1.3 2013/02/14 01:21:25 matt Exp $
+# $NetBSD: Makefile.prog,v 1.4 2013/02/14 02:52:59 matt Exp $
#
# Common Makefile fragment for a binutils program.
#
@@ -26,13 +26,13 @@ DPADD+= ${LIBINTL}
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
OPCODESOBJ!= cd ${TOP}/${BFDSUBDIR}/libopcodes && ${PRINTOBJDIR}
LDADD+= -L${OPCODESOBJ} -lopcodes
-LIBDPLIBS+= -lopcodes ${OPCODEOBJ}
+PROGDPLIBS+= -lopcodes ${OPCODEOBJ}
.endif
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*)
BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
LDADD+= -L${BFDOBJ} -lbfd
-LIBDPLIBS+= -lbfd ${BFDOBJ}
+PROGDPLIBS+= -lbfd ${BFDOBJ}
.endif
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libiberty*)
Index: src/external/gpl3/binutils/usr.bin/gas/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gas/Makefile:1.6 src/external/gpl3/binutils/usr.bin/gas/Makefile:1.7
--- src/external/gpl3/binutils/usr.bin/gas/Makefile:1.6 Thu Feb 14 01:21:25 2013
+++ src/external/gpl3/binutils/usr.bin/gas/Makefile Thu Feb 14 02:52:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/02/14 01:21:25 matt Exp $
+# $NetBSD: Makefile,v 1.7 2013/02/14 02:52:59 matt Exp $
.include <bsd.own.mk>
@@ -29,11 +29,11 @@ DPADD= ${LIBINTL}
OPCODESOBJ!= cd ${TOP}/${BFDSUBDIR}/libopcodes && ${PRINTOBJDIR}
LDADD+= -L${OPCODESOBJ} -lopcodes
-LIBDPLIBS+= -lopcodes ${OPCODESOBJ}
+PROGDPLIBS+= -lopcodes ${OPCODESOBJ}
BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
LDADD+= -L${BFDOBJ} -lbfd
-LIBDPLIBS+= -lbfd ${BFDOBJ}
+PROGDPLIBS+= -lbfd ${BFDOBJ}
IBERTYOBJ!= cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
LDADD+= -L${IBERTYOBJ} -liberty
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.13 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.14
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.13 Thu Feb 14 01:21:25 2013
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Thu Feb 14 02:52:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/02/14 01:21:25 matt Exp $
+# $NetBSD: Makefile,v 1.14 2013/02/14 02:52:59 matt Exp $
.include <bsd.own.mk>
@@ -27,7 +27,7 @@ COPTS.ldgram.c = -Wno-stack-protector
BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
LDADD+= -L${BFDOBJ} -lbfd
-LIBDPLIBS+= -lbfd ${BFDOBJ}
+PROGDPLIBS+= -lbfd ${BFDOBJ}
IBERTYOBJ!= cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
LDADD+= -L${IBERTYOBJ} -liberty
Index: src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.4 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.5
--- src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.4 Thu Feb 14 01:21:26 2013
+++ src/external/gpl3/binutils/usr.sbin/dbsym/Makefile Thu Feb 14 02:52:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/02/14 01:21:26 matt Exp $
+# $NetBSD: Makefile,v 1.5 2013/02/14 02:52:59 matt Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ MAN= dbsym.8
CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
.if !defined(HOSTPROG)
-LIBDPLIBS+= -lbfd ${BFDDIR}
+PROGDPLIBS+= -lbfd ${BFDDIR}
.else
DPADD+= ${BFDDIR}/libbfd.a
.endif
Index: src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.4 src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.5
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.4 Thu Feb 14 01:21:26 2013
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Thu Feb 14 02:52:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/02/14 01:21:26 matt Exp $
+# $NetBSD: Makefile,v 1.5 2013/02/14 02:52:59 matt Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ MAN= mdsetimage.8
CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
.if !defined(HOSTPROG)
-LIBDPLIBS+= -lbfd ${BFDDIR}
+PROGDPLIBS+= -lbfd ${BFDDIR}
.else
DPADD+= ${BFDDIR}/libbfd.a
.endif
