3 files changed, 27 insertions, 19 deletions

diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 8e8afd9da8bb..1dff4bea5ac9 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:03 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -7,33 +7,19 @@
 .PATH: ${SRCDIR}/bfd
 
 LIB=		bfd
-SRCS=		aout32.c archive.c archures.c bfd.c binary.c \
-		cache.c coff-i386.c coffgen.c cofflink.c corefile.c \
-		cpu-i386.c elf.c elf32-i386.c elf32.c elflink.c \
-		format.c hash.c i386bsd.c i386freebsd.c ihex.c \
+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
-CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
-CFLAGS+=	-DSELECT_VECS="&bfd_elf32_i386_vec,&i386freebsd_vec,&i386bsd_vec,&i386coff_vec"
-CFLAGS+=	-DSELECT_ARCHITECTURES="&bfd_i386_arch"
-CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
-CFLAGS+=	-DHAVE_i386freebsd_vec
-CFLAGS+=	-DHAVE_i386bsd_vec
-CFLAGS+=	-DHAVE_i386coff_vec
 CFLAGS+=	-I${SRCDIR}/bfd
 NOPROFILE=	true
 NOPIC=		true
-CLEANFILES+=	elf32-target.h targmatch.h
+CLEANFILES+=	targmatch.h
 
-beforedepend: elf32-target.h targmatch.h
+beforedepend: targmatch.h
 
 targets.o: targmatch.h
 
-elf32-i386.o: elf32-target.h
-
-elf32-target.h: elfxx-target.h
-	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
-
 targmatch.h: targmatch.sed config.bfd
 	sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
new file mode 100644
index 000000000000..2db51f329ae4
--- /dev/null
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -0,0 +1,22 @@
+#
+# $Id$
+#
+
+SRCS+=		aout32.c coff-i386.c cofflink.c cpu-i386.c \
+		elf32-i386.c elf32.c elflink.c i386bsd.c \
+		i386freebsd.c
+CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
+CFLAGS+=	-DSELECT_VECS="&bfd_elf32_i386_vec,&i386freebsd_vec,&i386bsd_vec,&i386coff_vec"
+CFLAGS+=	-DSELECT_ARCHITECTURES="&bfd_i386_arch"
+CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
+CFLAGS+=	-DHAVE_i386freebsd_vec
+CFLAGS+=	-DHAVE_i386bsd_vec
+CFLAGS+=	-DHAVE_i386coff_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}
diff --git a/gnu/usr.bin/binutils/libbfd/config.h b/gnu/usr.bin/binutils/libbfd/i386/config.h
index b38903fa3b4b..b38903fa3b4b 100644
--- a/gnu/usr.bin/binutils/libbfd/config.h
+++ b/gnu/usr.bin/binutils/libbfd/i386/config.h