From 5b728dfd69e1dcf11b0dfff9dd3e44b69f499cd4 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 19 Jun 2004 20:37:38 +0000
Subject: [PATCH] Move the elf32-target.h and elf64-target.h targets from the
 MD makefiles to the centralized makefile. This not only reduces duplication,
 it also makes the MD quirks stand out better and thus improves maintenance.

---
 gnu/usr.bin/binutils/libbfd/Makefile         | 6 ++++++
 gnu/usr.bin/binutils/libbfd/Makefile.alpha   | 2 --
 gnu/usr.bin/binutils/libbfd/Makefile.amd64   | 3 ---
 gnu/usr.bin/binutils/libbfd/Makefile.i386    | 2 --
 gnu/usr.bin/binutils/libbfd/Makefile.ia64    | 6 ------
 gnu/usr.bin/binutils/libbfd/Makefile.powerpc | 2 --
 gnu/usr.bin/binutils/libbfd/Makefile.sparc64 | 5 -----
 7 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 04f3bebceb50..b84e0b7c786d 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -63,4 +63,10 @@ config.h: config.h.fbsd
 	sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET}
 .endif
 
+elf32-target.h: elfxx-target.h
+	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
+
+elf64-target.h: elfxx-target.h
+	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
+
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index ea01cda63928..2eb54ed99565 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -10,5 +10,3 @@ CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 .endif
 
 CLEANFILES+=	elf64-target.h
-elf64-target.h: elfxx-target.h
-	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.amd64 b/gnu/usr.bin/binutils/libbfd/Makefile.amd64
index 012ff129535b..a87af3523bcc 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.amd64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.amd64
@@ -13,9 +13,6 @@ SRCS+=	elf64-amd64-fbsd.c elf64-target.h elf64-gen.c elf64.c
 
 CLEANFILES+=	elf64-target.h
 
-elf64-target.h:	elfxx-target.h
-	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
-
 CLEANFILES+=	elf64-amd64-fbsd.c
 
 elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index 9f3b4e432763..f940958bcc6e 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -14,5 +14,3 @@ VECS+=	i386pe_vec i386pei_vec
 .endif
 
 CLEANFILES+=	elf32-target.h
-elf32-target.h:	elfxx-target.h
-	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
index 1831e1a3d193..6b91b92d46c8 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.ia64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
@@ -20,12 +20,6 @@ GENSRCS= elf32-target.h elf64-target.h elf64-ia64.c pepigen.c # peigen.c
 SRCS+=	${GENSRCS}
 CLEANFILES+=	${GENSRCS}
 
-elf32-target.h: elfxx-target.h
-	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
-
-elf64-target.h: elfxx-target.h
-	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
-
 elf64-ia64.c: elfxx-ia64.c
 	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
index df0c57fc36fd..f4eb885b2fab 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
@@ -21,5 +21,3 @@ CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 .endif
 
 CLEANFILES+=	elf32-target.h
-elf32-target.h: elfxx-target.h
-	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64 b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
index 868a5f126a68..13fbec98df7a 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
@@ -20,11 +20,6 @@ CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 .endif
 
 CLEANFILES+=	elf32-target.h elf64-target.h
-elf32-target.h:	elfxx-target.h
-	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
-
-elf64-target.h:	elfxx-target.h
-	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES+=	elf64-sparc%FIXED.c
 elf64-sparc%FIXED.c: elf64-sparc.c elf64-sparc.c-bad-rtld.diff