3 files changed, 34 insertions, 24 deletions
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index df9d469..25532b8 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/03/12 02:55:25 jdp Exp $
+# $Id: Makefile,v 1.3 1998/03/12 05:14:09 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -18,6 +18,26 @@ INTERNALLIB=	true
 INTERNALSTATICLIB=true
 CLEANFILES+=	targmatch.h
 
+SELARCH=
+.for _a in ${ARCHS}
+.if ${SELARCH} == ""
+SELARCH+=&bfd_${_a}_arch
+.else
+SELARCH+=,&bfd_${_a}_arch
+.endif
+.endfor
+CFLAGS+=	-DSELECT_ARCHITECTURES="${SELARCH}"
+
+SELVEC=
+.for _v in ${VECS}
+.if ${SELVEC} == ""
+SELVEC+=&${_v}
+.else
+SELVEC+=,&${_v}
+.endif
+.endfor
+CFLAGS+=	-DSELECT_VECS="${SELVEC}"
+
 beforedepend: targmatch.h
 
 targets.o: targmatch.h
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 5f5aa27..ca77a9c 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -1,30 +1,20 @@
 #
-# $Id: Makefile.i386,v 1.1 1998/03/12 02:55:26 jdp Exp $
+# $Id: Makefile.alpha,v 1.1 1998/03/12 12:29:20 jb Exp $
 #
 
 SRCS+=		coff-alpha.c cpu-alpha.c ecoff.c ecofflink.c elf64-alpha.c \
 		elf64.c elflink.c
-SRCS+=		aout32.c coff-i386.c cofflink.c cpu-i386.c \
-		elf32-i386.c elf32.c i386bsd.c i386freebsd.c
+VECS+=		bfd_elf64_alpha_vec ecoffalpha_little_vec
+.if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf64_alpha_vec
-CFLAGS+=	-DSELECT_VECS="&bfd_elf64_alpha_vec,&ecoffalpha_little_vec,&bfd_elf32_i386_vec,&i386freebsd_vec,&i386bsd_vec,&i386coff_vec"
-CFLAGS+=	-DSELECT_ARCHITECTURES="&bfd_alpha_arch,&bfd_i386_arch"
+.endif
 CFLAGS+=	-DHAVE_bfd_elf64_alpha_vec
 CFLAGS+=	-DHAVE_ecoffalpha_little_vec
-CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
-CFLAGS+=	-DHAVE_i386freebsd_vec
-CFLAGS+=	-DHAVE_i386bsd_vec
-CFLAGS+=	-DHAVE_i386coff_vec
-CLEANFILES+=	elf64-target.h 	elf32-target.h
+CLEANFILES+=	elf64-target.h
 
-beforedepend: elf64-target.h elf32-target.h
+beforedepend: elf64-target.h
 
 elf64-alpha.o: elf64-target.h
 
-elf32-i386.o: elf32-target.h
-
 elf64-target.h: elfxx-target.h
 	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
-
-elf32-target.h: elfxx-target.h
-	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index c948727..de2f0e1 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,17 +1,17 @@
 #
-# $Id: Makefile.i386,v 1.2 1998/03/14 01:40:31 jdp Exp $
+# $Id: Makefile.i386,v 1.3 1998/03/30 02:21:22 jdp Exp $
 #
-
 SRCS+=		cpu-i386.c elf32-i386.c elf32.c elflink.c
+VECS+=		bfd_elf32_i386_vec
+.if ${MACHINE_ARCH} == "i386"
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
-CFLAGS+=	-DSELECT_VECS="&bfd_elf32_i386_vec"
-CFLAGS+=	-DSELECT_ARCHITECTURES="&bfd_i386_arch"
+.endif
 CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
 CLEANFILES+=	elf32-target.h
 
-beforedepend: elf32-target.h
+beforedepend:	elf32-target.h
 
-elf32-i386.o: elf32-target.h
+elf32-i386.o:	elf32-target.h
 
-elf32-target.h: elfxx-target.h
+elf32-target.h:	elfxx-target.h
 	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}