[src/trunk]: src/external/gpl3/binutils Centralize the definition of TOP/DIST...

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

details:   https://anonhg.NetBSD.org/src/rev/bf318da67c32
branches:  trunk
changeset: 343259:bf318da67c32
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 26 19:37:46 2016 +0000

description:
Centralize the definition of TOP/DIST and cleanup a little.

diffstat:

 external/gpl3/binutils/Makefile.inc                 |   4 ++++
 external/gpl3/binutils/lib/Makefile.inc             |   2 ++
 external/gpl3/binutils/lib/libbfd/Makefile          |   6 ++----
 external/gpl3/binutils/lib/libiberty/Makefile       |   6 ++----
 external/gpl3/binutils/lib/libopcodes/Makefile      |   6 ++----
 external/gpl3/binutils/usr.bin/Makefile.inc         |  19 ++-----------------
 external/gpl3/binutils/usr.bin/addr2line/Makefile   |   4 +---
 external/gpl3/binutils/usr.bin/ar/Makefile          |   4 +---
 external/gpl3/binutils/usr.bin/c++filt/Makefile     |   4 +---
 external/gpl3/binutils/usr.bin/coffdump/Makefile    |   4 +---
 external/gpl3/binutils/usr.bin/common/Makefile      |   6 +-----
 external/gpl3/binutils/usr.bin/common/Makefile.inc  |  13 +++++++++++--
 external/gpl3/binutils/usr.bin/common/Makefile.prog |  10 ++++------
 external/gpl3/binutils/usr.bin/elfedit/Makefile     |   4 +---
 external/gpl3/binutils/usr.bin/gas/Makefile         |  12 ++++--------
 external/gpl3/binutils/usr.bin/gprof/Makefile       |   7 ++-----
 external/gpl3/binutils/usr.bin/ld/Makefile          |  21 +++++++++------------
 external/gpl3/binutils/usr.bin/nlmconv/Makefile     |   4 +---
 external/gpl3/binutils/usr.bin/nm/Makefile          |   4 +---
 external/gpl3/binutils/usr.bin/objcopy/Makefile     |   4 +---
 external/gpl3/binutils/usr.bin/objdump/Makefile     |   4 +---
 external/gpl3/binutils/usr.bin/ranlib/Makefile      |   4 +---
 external/gpl3/binutils/usr.bin/readelf/Makefile     |   4 +---
 external/gpl3/binutils/usr.bin/size/Makefile        |   4 +---
 external/gpl3/binutils/usr.bin/strings/Makefile     |   4 +---
 external/gpl3/binutils/usr.bin/strip/Makefile       |   4 +---
 external/gpl3/binutils/usr.sbin/Makefile.inc        |   3 ++-
 external/gpl3/binutils/usr.sbin/dbsym/Makefile      |   4 +---
 external/gpl3/binutils/usr.sbin/mdsetimage/Makefile |   4 +---
 29 files changed, 63 insertions(+), 116 deletions(-)

diffs (truncated from 497 to 300 lines):

diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/binutils/Makefile.inc       Tue Jan 26 19:37:46 2016 +0000
@@ -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
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/lib/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/binutils/lib/Makefile.inc   Tue Jan 26 19:37:46 2016 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/26 19:37:47 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/lib/libbfd/Makefile
--- a/external/gpl3/binutils/lib/libbfd/Makefile        Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/lib/libbfd/Makefile        Tue Jan 26 19:37:46 2016 +0000
@@ -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 @@
 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 @@
 .if exists(${DEFS_MK})
 .include "${DEFS_MK}"
 
-DIST=          ${NETBSDSRCDIR}/external/gpl3/binutils/dist
-
 SHLIB_MAJOR=   13
 SHLIB_MINOR=   0
 
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/lib/libiberty/Makefile
--- a/external/gpl3/binutils/lib/libiberty/Makefile     Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/lib/libiberty/Makefile     Tue Jan 26 19:37:46 2016 +0000
@@ -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 @@
 NOLINKLIB=     # defined
 NOCLANGERROR=  # defined
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=           iberty
 
@@ -19,8 +19,6 @@
 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}
 
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/lib/libopcodes/Makefile
--- a/external/gpl3/binutils/lib/libopcodes/Makefile    Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/lib/libopcodes/Makefile    Tue Jan 26 19:37:46 2016 +0000
@@ -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 @@
 NOPROFILE=     # defined
 NOCLANGERROR=  # defined
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=           opcodes
 
@@ -15,8 +15,6 @@
 .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
 
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/Makefile.inc
--- a/external/gpl3/binutils/usr.bin/Makefile.inc       Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/Makefile.inc       Tue Jan 26 19:37:46 2016 +0000
@@ -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"
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/addr2line/Makefile
--- a/external/gpl3/binutils/usr.bin/addr2line/Makefile Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/addr2line/Makefile Tue Jan 26 19:37:46 2016 +0000
@@ -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"
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/ar/Makefile
--- a/external/gpl3/binutils/usr.bin/ar/Makefile        Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/ar/Makefile        Tue Jan 26 19:37:46 2016 +0000
@@ -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"
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/c++filt/Makefile
--- a/external/gpl3/binutils/usr.bin/c++filt/Makefile   Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/c++filt/Makefile   Tue Jan 26 19:37:46 2016 +0000
@@ -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
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/coffdump/Makefile
--- a/external/gpl3/binutils/usr.bin/coffdump/Makefile  Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/coffdump/Makefile  Tue Jan 26 19:37:46 2016 +0000
@@ -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"
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/common/Makefile
--- a/external/gpl3/binutils/usr.bin/common/Makefile    Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile    Tue Jan 26 19:37:46 2016 +0000
@@ -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"
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/common/Makefile.inc
--- a/external/gpl3/binutils/usr.bin/common/Makefile.inc        Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.inc        Tue Jan 26 19:37:46 2016 +0000
@@ -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
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/common/Makefile.prog
--- a/external/gpl3/binutils/usr.bin/common/Makefile.prog       Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.prog       Tue Jan 26 19:37:46 2016 +0000
@@ -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}
 
-BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
-
-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 @@
                ${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
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/elfedit/Makefile
--- a/external/gpl3/binutils/usr.bin/elfedit/Makefile   Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/elfedit/Makefile   Tue Jan 26 19:37:46 2016 +0000
@@ -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"
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/gas/Makefile
--- a/external/gpl3/binutils/usr.bin/gas/Makefile       Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/gas/Makefile       Tue Jan 26 19:37:46 2016 +0000
@@ -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.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
diff -r 3b7f33c5e63b -r bf318da67c32 external/gpl3/binutils/usr.bin/gprof/Makefile
--- a/external/gpl3/binutils/usr.bin/gprof/Makefile     Tue Jan 26 19:09:56 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/gprof/Makefile     Tue Jan 26 19:37:46 2016 +0000
@@ -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}