From ae33d52efb79759a26cf5ab89c03523fe66de10e Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Thu, 4 Jun 1998 06:50:58 +0000
Subject: [PATCH] Don't use beforedepend or give dependencies on generated
 headers explicitly. Just put generated headers in SRCS.

---
 gnu/usr.bin/binutils/libbfd/Makefile       | 9 +++------
 gnu/usr.bin/binutils/libbfd/Makefile.alpha | 8 ++------
 gnu/usr.bin/binutils/libbfd/Makefile.i386  | 8 ++------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 25532b817e58..ef9adaa2dc31 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.3 1998/03/12 05:14:09 jdp Exp $
+# $Id: Makefile,v 1.4 1998/05/04 21:16:46 jb Exp $
 #
 
 .include "../Makefile.inc0"
@@ -10,7 +10,8 @@ LIB=		bfd
 SRCS+=		archive.c archures.c bfd.c binary.c cache.c \
 		coffgen.c corefile.c elf.c format.c hash.c ihex.c \
 		init.c libbfd.c linker.c opncls.c reloc.c section.c \
-		srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c
+		srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \
+		targmatch.h
 CFLAGS+=	-I${SRCDIR}/bfd
 NOPROFILE=	true
 NOPIC=		true
@@ -38,10 +39,6 @@ SELVEC+=,&${_v}
 .endfor
 CFLAGS+=	-DSELECT_VECS="${SELVEC}"
 
-beforedepend: targmatch.h
-
-targets.o: targmatch.h
-
 targmatch.h: targmatch.sed config.bfd
 	sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index ca77a9cd11ad..7c98ead96f6e 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -1,9 +1,9 @@
 #
-# $Id: Makefile.alpha,v 1.1 1998/03/12 12:29:20 jb Exp $
+# $Id: Makefile.alpha,v 1.2 1998/05/04 21:16:46 jb Exp $
 #
 
 SRCS+=		coff-alpha.c cpu-alpha.c ecoff.c ecofflink.c elf64-alpha.c \
-		elf64.c elflink.c
+		elf64-target.h elf64.c elflink.c
 VECS+=		bfd_elf64_alpha_vec ecoffalpha_little_vec
 .if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf64_alpha_vec
@@ -12,9 +12,5 @@ CFLAGS+=	-DHAVE_bfd_elf64_alpha_vec
 CFLAGS+=	-DHAVE_ecoffalpha_little_vec
 CLEANFILES+=	elf64-target.h
 
-beforedepend: elf64-target.h
-
-elf64-alpha.o: 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.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index de2f0e1d5239..b7d73470108c 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,7 +1,7 @@
 #
-# $Id: Makefile.i386,v 1.3 1998/03/30 02:21:22 jdp Exp $
+# $Id: Makefile.i386,v 1.4 1998/05/04 21:16:46 jb Exp $
 #
-SRCS+=		cpu-i386.c elf32-i386.c elf32.c elflink.c
+SRCS+=		cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c
 VECS+=		bfd_elf32_i386_vec
 .if ${MACHINE_ARCH} == "i386"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
@@ -9,9 +9,5 @@ CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
 CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
 CLEANFILES+=	elf32-target.h
 
-beforedepend:	elf32-target.h
-
-elf32-i386.o:	elf32-target.h
-
 elf32-target.h:	elfxx-target.h
 	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}