Module Name: src
Committed By: christos
Date: Thu Feb 14 03:36:45 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:
fix previous
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/usr.bin/common/Makefile.prog
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/usr.bin/gas/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/binutils/usr.bin/ld/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.5 -r1.6 \
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.4 src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.5
--- src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.4 Wed Feb 13 21:52:59 2013
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.prog Wed Feb 13 22:36:44 2013
@@ -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 @@ LDADD+= -lintl
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
Index: src/external/gpl3/binutils/usr.bin/gas/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gas/Makefile:1.7 src/external/gpl3/binutils/usr.bin/gas/Makefile:1.8
--- src/external/gpl3/binutils/usr.bin/gas/Makefile:1.7 Wed Feb 13 21:52:59 2013
+++ src/external/gpl3/binutils/usr.bin/gas/Makefile Wed Feb 13 22:36:44 2013
@@ -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${.CURDIR}/arch/${MACHINE_A
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
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.14 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.15
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.14 Wed Feb 13 21:52:59 2013
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Wed Feb 13 22:36:44 2013
@@ -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 @@ DPADD= ${LIBINTL}
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}
Index: src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.5 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.6
--- src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.5 Wed Feb 13 21:52:59 2013
+++ src/external/gpl3/binutils/usr.sbin/dbsym/Makefile Wed Feb 13 22:36:44 2013
@@ -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 @@ BFDSUBDIR= lib
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}
Index: src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.5 src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.6
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.5 Wed Feb 13 21:52:59 2013
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Wed Feb 13 22:36:44 2013
@@ -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 @@ BFDSUBDIR= lib
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}
