Module Name: src
Committed By: christos
Date: Tue Jan 26 19:37:49 UTC 2016
Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/binutils/lib/libiberty: Makefile
src/external/gpl3/binutils/lib/libopcodes: Makefile
src/external/gpl3/binutils/usr.bin: Makefile.inc
src/external/gpl3/binutils/usr.bin/addr2line: Makefile
src/external/gpl3/binutils/usr.bin/ar: Makefile
src/external/gpl3/binutils/usr.bin/c++filt: Makefile
src/external/gpl3/binutils/usr.bin/coffdump: Makefile
src/external/gpl3/binutils/usr.bin/common: Makefile Makefile.inc
Makefile.prog
src/external/gpl3/binutils/usr.bin/elfedit: Makefile
src/external/gpl3/binutils/usr.bin/gas: Makefile
src/external/gpl3/binutils/usr.bin/gprof: Makefile
src/external/gpl3/binutils/usr.bin/ld: Makefile
src/external/gpl3/binutils/usr.bin/nlmconv: Makefile
src/external/gpl3/binutils/usr.bin/nm: Makefile
src/external/gpl3/binutils/usr.bin/objcopy: Makefile
src/external/gpl3/binutils/usr.bin/objdump: Makefile
src/external/gpl3/binutils/usr.bin/ranlib: Makefile
src/external/gpl3/binutils/usr.bin/readelf: Makefile
src/external/gpl3/binutils/usr.bin/size: Makefile
src/external/gpl3/binutils/usr.bin/strings: Makefile
src/external/gpl3/binutils/usr.bin/strip: Makefile
src/external/gpl3/binutils/usr.sbin: Makefile.inc
src/external/gpl3/binutils/usr.sbin/dbsym: Makefile
src/external/gpl3/binutils/usr.sbin/mdsetimage: Makefile
Added Files:
src/external/gpl3/binutils: Makefile.inc
src/external/gpl3/binutils/lib: Makefile.inc
Log Message:
Centralize the definition of TOP/DIST and cleanup a little.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/binutils/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/gpl3/binutils/lib/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/lib/libiberty/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/lib/libopcodes/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/usr.bin/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/addr2line/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/ar/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/c++filt/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/coffdump/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/usr.bin/common/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/usr.bin/common/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/binutils/usr.bin/common/Makefile.prog
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/elfedit/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/binutils/usr.bin/gas/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils/usr.bin/gprof/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/binutils/usr.bin/ld/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/nlmconv/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/nm/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/objcopy/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/objdump/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/ranlib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/readelf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/size/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/strings/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/strip/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/usr.sbin/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.10 -r1.11 \
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/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.13 src/external/gpl3/binutils/lib/libbfd/Makefile:1.14
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.13 Sat Mar 28 03:03:23 2015
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Tue Jan 26 14:37:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/03/28 07:03:23 matt Exp $
+# $NetBSD: Makefile,v 1.14 2016/01/26 19:37:47 christos Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -6,7 +6,7 @@ NOMAN= # defined
NOPROFILE= # defined
NOCLANGERROR= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
# If the platform does not support shared libraries, we need to supply
# *something* for BFD-using programs to link against. Also provide an
@@ -25,8 +25,6 @@ DEFS_MK=${.CURDIR}/arch/${BFD_MACHINE_AR
.if exists(${DEFS_MK})
.include "${DEFS_MK}"
-DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
-
SHLIB_MAJOR= 13
SHLIB_MINOR= 0
Index: src/external/gpl3/binutils/lib/libiberty/Makefile
diff -u src/external/gpl3/binutils/lib/libiberty/Makefile:1.4 src/external/gpl3/binutils/lib/libiberty/Makefile:1.5
--- src/external/gpl3/binutils/lib/libiberty/Makefile:1.4 Tue Aug 6 01:35:57 2013
+++ src/external/gpl3/binutils/lib/libiberty/Makefile Tue Jan 26 14:37:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/08/06 05:35:57 matt Exp $
+# $NetBSD: Makefile,v 1.5 2016/01/26 19:37:47 christos Exp $
NOLINT= # defined
NOPROFILE= # defined
@@ -6,7 +6,7 @@ NOPIC= # defined
NOLINKLIB= # defined
NOCLANGERROR= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
LIB= iberty
@@ -19,8 +19,6 @@ COPTS.cp-demangle.c = -Wno-stack-protect
COPTS.make-relative-prefix.c = -Wno-stack-protector
COPTS.regex.c = -Wno-stack-protector
-DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
-
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c}
Index: src/external/gpl3/binutils/lib/libopcodes/Makefile
diff -u src/external/gpl3/binutils/lib/libopcodes/Makefile:1.7 src/external/gpl3/binutils/lib/libopcodes/Makefile:1.8
--- src/external/gpl3/binutils/lib/libopcodes/Makefile:1.7 Sun Sep 29 10:20:35 2013
+++ src/external/gpl3/binutils/lib/libopcodes/Makefile Tue Jan 26 14:37:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/09/29 14:20:35 christos Exp $
+# $NetBSD: Makefile,v 1.8 2016/01/26 19:37:47 christos Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -6,7 +6,7 @@ NOMAN= # defined
NOPROFILE= # defined
NOCLANGERROR= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
LIB= opcodes
@@ -15,8 +15,6 @@ BFD_MACHINE_ARCH?= ${MACHINE_ARCH:C/armv
.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
-DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
-
SHLIB_MAJOR= 6
SHLIB_MINOR= 0
Index: src/external/gpl3/binutils/usr.bin/Makefile.inc
diff -u src/external/gpl3/binutils/usr.bin/Makefile.inc:1.6 src/external/gpl3/binutils/usr.bin/Makefile.inc:1.7
--- src/external/gpl3/binutils/usr.bin/Makefile.inc:1.6 Tue Aug 6 01:35:57 2013
+++ src/external/gpl3/binutils/usr.bin/Makefile.inc Tue Jan 26 14:37:47 2016
@@ -1,20 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.6 2013/08/06 05:35:57 matt Exp $
+# $NetBSD: Makefile.inc,v 1.7 2016/01/26 19:37:47 christos Exp $
BINDIR?= /usr/bin
-
-.if !defined(__MAKEFILE_INC_INCLUDED__)
-__MAKEFILE_INC_INCLUDED__=1
-
-.include <bsd.own.mk>
-
-BINUTILS_MACHINE_ARCH= ${MACHINE_ARCH:C/armv[4-7]/arm/}
-
-GNUHOSTDIST= ${DIST}
-GNUCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
-CPPFLAGS+= ${GNUCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GNUCPPFLAGS:M-I*:N-I.*} \
- -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} \
- -I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
- -DLOCALEDIR=\"${LOCALEDIR}\"
NOGCCERROR= # defined
-
-.endif # __MAKEFILE_INC_INCLUDED__
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/gpl3/binutils/usr.bin/addr2line/Makefile
diff -u src/external/gpl3/binutils/usr.bin/addr2line/Makefile:1.1 src/external/gpl3/binutils/usr.bin/addr2line/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/addr2line/Makefile:1.1 Tue Aug 18 16:22:07 2009
+++ src/external/gpl3/binutils/usr.bin/addr2line/Makefile Tue Jan 26 14:37:47 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:07 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:47 christos Exp $
PROG= addr2line
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/ar/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ar/Makefile:1.2 src/external/gpl3/binutils/usr.bin/ar/Makefile:1.3
--- src/external/gpl3/binutils/usr.bin/ar/Makefile:1.2 Sun Sep 25 00:32:46 2011
+++ src/external/gpl3/binutils/usr.bin/ar/Makefile Tue Jan 26 14:37:47 2016
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2011/09/25 04:32:46 christos Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/26 19:37:47 christos Exp $
PROG= ar
COPTS.arparse.c = -Wno-stack-protector
CPPFLAGS+=-Dbin_dummy_emulation=bin_vanilla_emulation
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/c++filt/Makefile
diff -u src/external/gpl3/binutils/usr.bin/c++filt/Makefile:1.1 src/external/gpl3/binutils/usr.bin/c++filt/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/c++filt/Makefile:1.1 Tue Aug 18 16:22:08 2009
+++ src/external/gpl3/binutils/usr.bin/c++filt/Makefile Tue Jan 26 14:37:47 2016
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:08 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:47 christos Exp $
PROG= c++filt
CPPFLAGS+= -DMAIN
CLEANFILES+= c++filt.1
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
.PATH: ${DIST}/libiberty
Index: src/external/gpl3/binutils/usr.bin/coffdump/Makefile
diff -u src/external/gpl3/binutils/usr.bin/coffdump/Makefile:1.1 src/external/gpl3/binutils/usr.bin/coffdump/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/coffdump/Makefile:1.1 Tue Aug 18 16:22:08 2009
+++ src/external/gpl3/binutils/usr.bin/coffdump/Makefile Tue Jan 26 14:37:47 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:08 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:47 christos Exp $
PROG= coffdump
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/common/Makefile
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile:1.6 src/external/gpl3/binutils/usr.bin/common/Makefile:1.7
--- src/external/gpl3/binutils/usr.bin/common/Makefile:1.6 Sun Aug 4 20:08:58 2013
+++ src/external/gpl3/binutils/usr.bin/common/Makefile Tue Jan 26 14:37:47 2016
@@ -1,8 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/08/05 00:08:58 matt Exp $
-
-.include <bsd.own.mk>
-
-TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
+# $NetBSD: Makefile,v 1.7 2016/01/26 19:37:47 christos Exp $
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.inc
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.3 src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.4
--- src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.3 Tue Aug 6 01:35:57 2013
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.inc Tue Jan 26 14:37:47 2016
@@ -1,10 +1,19 @@
-# $NetBSD: Makefile.inc,v 1.3 2013/08/06 05:35:57 matt Exp $
+# $NetBSD: Makefile.inc,v 1.4 2016/01/26 19:37:47 christos Exp $
.if !defined(__COMMON_MAKEFILE_INC_INCLUDED__)
__COMMON_MAKEFILE_INC_INCLUDED__=1
+.include <bsd.init.mk>
+
+BINUTILS_MACHINE_ARCH= ${MACHINE_ARCH:C/armv[4-7]/arm/}
+
+GNUHOSTDIST= ${DIST}
+GNUCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
+CPPFLAGS+= ${GNUCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GNUCPPFLAGS:M-I*:N-I.*} \
+ -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} \
+ -I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
+ -DLOCALEDIR=\"${LOCALEDIR}\"
BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
-DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
BFDSUBDIR= lib
.endif
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.prog
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.9 src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.10
--- src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.9 Tue Aug 6 01:35:57 2013
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.prog Tue Jan 26 14:37:47 2016
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile.prog,v 1.9 2013/08/06 05:35:57 matt Exp $
+# $NetBSD: Makefile.prog,v 1.10 2016/01/26 19:37:47 christos Exp $
#
# Common Makefile fragment for a binutils program.
#
-.include <bsd.own.mk>
-
BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
+CPPFLAGS+= -I${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}
-TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
+.include <bsd.init.mk>
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
@@ -20,7 +19,6 @@ SRCS= ${G_${BUPROG}_OBJECTS:.o=.c} \
${G_${BUPROG}_DEPENDENCIES:M*.o:.o=.c}
MAN= ${G_man_MANS:M${PROG}.1}
-CPPFLAGS+= -I${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
PROGDPLIBS+= opcodes ${TOP}/${BFDSUBDIR}/libopcodes
Index: src/external/gpl3/binutils/usr.bin/elfedit/Makefile
diff -u src/external/gpl3/binutils/usr.bin/elfedit/Makefile:1.1 src/external/gpl3/binutils/usr.bin/elfedit/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/elfedit/Makefile:1.1 Sun Sep 25 00:32:46 2011
+++ src/external/gpl3/binutils/usr.bin/elfedit/Makefile Tue Jan 26 14:37:47 2016
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2011/09/25 04:32:46 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:47 christos Exp $
PROG= elfedit
SRCS= elfcomm.c elfedit.c
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/gas/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gas/Makefile:1.12 src/external/gpl3/binutils/usr.bin/gas/Makefile:1.13
--- src/external/gpl3/binutils/usr.bin/gas/Makefile:1.12 Wed Oct 2 10:35:33 2013
+++ src/external/gpl3/binutils/usr.bin/gas/Makefile Tue Jan 26 14:37:47 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2013/10/02 14:35:33 christos Exp $
+# $NetBSD: Makefile,v 1.13 2016/01/26 19:37:47 christos Exp $
-.include <bsd.own.mk>
-
-TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
+CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
+CPPFLAGS+= -I${DIST}/gas -I${DIST}/gas/config
+CPPFLAGS+= -I${DIST}
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
@@ -20,10 +20,6 @@ COPTS.symbols.c = -Wno-stack-protector
COPTS.stabs.c = -Wno-stack-protector
COPTS.macro.c = -Wno-stack-protector
-CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
-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
Index: src/external/gpl3/binutils/usr.bin/gprof/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.8 src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.9
--- src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.8 Sun Aug 4 20:08:58 2013
+++ src/external/gpl3/binutils/usr.bin/gprof/Makefile Tue Jan 26 14:37:48 2016
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2013/08/05 00:08:58 matt Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/26 19:37:48 christos Exp $
-.include <bsd.own.mk>
-
-TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
+CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
PROG= gprof
SRCS= ${G_gprof_OBJECTS:.o=.c}
-CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.21 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.22
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.21 Thu Oct 3 19:42:38 2013
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Tue Jan 26 14:37:48 2016
@@ -1,16 +1,5 @@
-# $NetBSD: Makefile,v 1.21 2013/10/03 23:42:38 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2016/01/26 19:37:48 christos Exp $
-.include <bsd.own.mk>
-
-TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
-
-.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
-
-SCRIPTSDIR= /usr/libdata
-
-PROG= ld
-SRCS= ${G_OFILES:.o=.c}
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/ld \
-DDEFAULT_EMULATION=\"${G_EMUL}\" \
@@ -20,6 +9,14 @@ CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_
-DTOOLBINDIR=\"/usr/bin\" \
-DENABLE_PLUGINS
+.include "${.CURDIR}/../common/Makefile.inc"
+.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
+
+SCRIPTSDIR= /usr/libdata
+
+PROG= ld
+SRCS= ${G_OFILES:.o=.c}
+
COPTS.ldgram.c = -Wno-stack-protector
PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
Index: src/external/gpl3/binutils/usr.bin/nlmconv/Makefile
diff -u src/external/gpl3/binutils/usr.bin/nlmconv/Makefile:1.1 src/external/gpl3/binutils/usr.bin/nlmconv/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/nlmconv/Makefile:1.1 Tue Aug 18 16:22:19 2009
+++ src/external/gpl3/binutils/usr.bin/nlmconv/Makefile Tue Jan 26 14:37:48 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:19 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:48 christos Exp $
PROG= nlmconv
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/nm/Makefile
diff -u src/external/gpl3/binutils/usr.bin/nm/Makefile:1.1 src/external/gpl3/binutils/usr.bin/nm/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/nm/Makefile:1.1 Tue Aug 18 16:22:19 2009
+++ src/external/gpl3/binutils/usr.bin/nm/Makefile Tue Jan 26 14:37:48 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:19 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:48 christos Exp $
PROG= nm
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/objcopy/Makefile
diff -u src/external/gpl3/binutils/usr.bin/objcopy/Makefile:1.1 src/external/gpl3/binutils/usr.bin/objcopy/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/objcopy/Makefile:1.1 Tue Aug 18 16:22:19 2009
+++ src/external/gpl3/binutils/usr.bin/objcopy/Makefile Tue Jan 26 14:37:48 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:19 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:48 christos Exp $
PROG= objcopy
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/objdump/Makefile
diff -u src/external/gpl3/binutils/usr.bin/objdump/Makefile:1.2 src/external/gpl3/binutils/usr.bin/objdump/Makefile:1.3
--- src/external/gpl3/binutils/usr.bin/objdump/Makefile:1.2 Sun Sep 29 10:20:37 2013
+++ src/external/gpl3/binutils/usr.bin/objdump/Makefile Tue Jan 26 14:37:48 2016
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2013/09/29 14:20:37 christos Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/26 19:37:48 christos Exp $
PROG= objdump
-.include <bsd.own.mk>
-
CPPFLAGS+=-DOBJDUMP_PRIVATE_VECTORS=""
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/ranlib/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ranlib/Makefile:1.2 src/external/gpl3/binutils/usr.bin/ranlib/Makefile:1.3
--- src/external/gpl3/binutils/usr.bin/ranlib/Makefile:1.2 Sun Sep 25 00:32:47 2011
+++ src/external/gpl3/binutils/usr.bin/ranlib/Makefile Tue Jan 26 14:37:48 2016
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/09/25 04:32:47 christos Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/26 19:37:48 christos Exp $
PROG= ranlib
-.include <bsd.own.mk>
-
COPTS.arparse.c = -Wno-stack-protector
CPPFLAGS+=-Dbin_dummy_emulation=bin_vanilla_emulation
Index: src/external/gpl3/binutils/usr.bin/readelf/Makefile
diff -u src/external/gpl3/binutils/usr.bin/readelf/Makefile:1.2 src/external/gpl3/binutils/usr.bin/readelf/Makefile:1.3
--- src/external/gpl3/binutils/usr.bin/readelf/Makefile:1.2 Thu Feb 14 16:29:36 2013
+++ src/external/gpl3/binutils/usr.bin/readelf/Makefile Tue Jan 26 14:37:48 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2013/02/14 21:29:36 christos Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/26 19:37:48 christos Exp $
PROG= readelf
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/size/Makefile
diff -u src/external/gpl3/binutils/usr.bin/size/Makefile:1.1 src/external/gpl3/binutils/usr.bin/size/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/size/Makefile:1.1 Tue Aug 18 16:22:20 2009
+++ src/external/gpl3/binutils/usr.bin/size/Makefile Tue Jan 26 14:37:48 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:20 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:48 christos Exp $
PROG= size
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/strings/Makefile
diff -u src/external/gpl3/binutils/usr.bin/strings/Makefile:1.1 src/external/gpl3/binutils/usr.bin/strings/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/strings/Makefile:1.1 Tue Aug 18 16:22:20 2009
+++ src/external/gpl3/binutils/usr.bin/strings/Makefile Tue Jan 26 14:37:48 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:20 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:48 christos Exp $
PROG= strings
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.bin/strip/Makefile
diff -u src/external/gpl3/binutils/usr.bin/strip/Makefile:1.1 src/external/gpl3/binutils/usr.bin/strip/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/strip/Makefile:1.1 Tue Aug 18 16:22:20 2009
+++ src/external/gpl3/binutils/usr.bin/strip/Makefile Tue Jan 26 14:37:48 2016
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:20 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/26 19:37:48 christos Exp $
PROG= strip
-.include <bsd.own.mk>
-
.include "${.CURDIR}/../common/Makefile.prog"
Index: src/external/gpl3/binutils/usr.sbin/Makefile.inc
diff -u src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.6 src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.7
--- src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.6 Sun Sep 29 10:20:37 2013
+++ src/external/gpl3/binutils/usr.sbin/Makefile.inc Tue Jan 26 14:37:48 2016
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.6 2013/09/29 14:20:37 christos Exp $
+# $NetBSD: Makefile.inc,v 1.7 2016/01/26 19:37:48 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
BINDIR?= /usr/sbin
WARNS?= 1
Index: src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.11 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.12
--- src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.11 Sun Sep 29 10:20:38 2013
+++ src/external/gpl3/binutils/usr.sbin/dbsym/Makefile Tue Jan 26 14:37:49 2016
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2013/09/29 14:20:38 christos Exp $
+# $NetBSD: Makefile,v 1.12 2016/01/26 19:37:49 christos Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
${MKBINUTILS} != "no"
-TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
-DIST= ${TOP}/dist
BFDSUBDIR= lib
PROG= dbsym
Index: src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.10 src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.11
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.10 Sun Aug 4 20:17:53 2013
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Tue Jan 26 14:37:49 2016
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2013/08/05 00:17:53 matt Exp $
+# $NetBSD: Makefile,v 1.11 2016/01/26 19:37:49 christos Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
${MKBINUTILS} != "no"
-TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
-DIST= ${TOP}/dist
BFDSUBDIR= lib
PROG= mdsetimage
Added files:
Index: src/external/gpl3/binutils/Makefile.inc
diff -u /dev/null src/external/gpl3/binutils/Makefile.inc:1.1
--- /dev/null Tue Jan 26 14:37:49 2016
+++ src/external/gpl3/binutils/Makefile.inc Tue Jan 26 14:37:46 2016
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/26 19:37:46 christos Exp $
+.include <bsd.own.mk>
+TOP= ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_BINUTILS_SUBDIR}
+DIST= ${TOP}/dist
Index: src/external/gpl3/binutils/lib/Makefile.inc
diff -u /dev/null src/external/gpl3/binutils/lib/Makefile.inc:1.1
--- /dev/null Tue Jan 26 14:37:49 2016
+++ src/external/gpl3/binutils/lib/Makefile.inc Tue Jan 26 14:37:47 2016
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/26 19:37:47 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
