From ab5ad3a4b52fafc4d244d6f407fbfad132ad2fa5 Mon Sep 17 00:00:00 2001 From: John Polstra Date: Thu, 12 Mar 1998 02:55:43 +0000 Subject: Restructure the binutils hierarchy somewhat in order to better support building it for variant architectures. It was already becoming clear that the former structure was too rigid and didn't scale well. The usual sort of makefile magic arranges to .include an architecture specific makefile "Makefile.${MACHINE_ARCH}" in each directory where it exists. Also, sources will be found in each subdirectory "${MACHINE_ARCH}" that exists. This is all taken care of automatically by the top level "Makefile.inc0". This all seems to work right for the i386 now. I have also converted those alpha pieces already present to the new schema as best I could. Also: change the BINDIR on the i386 to /usr/libexec/elf for "ar" and "ranlib". They are not object format independent enough to put into /usr/bin. --- gnu/usr.bin/binutils/ar/Makefile | 3 ++- gnu/usr.bin/binutils/ar/Makefile.i386 | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 gnu/usr.bin/binutils/ar/Makefile.i386 (limited to 'gnu/usr.bin/binutils/ar') diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile index 86f0ddf37e32..7374a727fa56 100644 --- a/gnu/usr.bin/binutils/ar/Makefile +++ b/gnu/usr.bin/binutils/ar/Makefile @@ -1,5 +1,5 @@ # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1998/03/01 23:40:51 jdp Exp $ # .include "../Makefile.inc0" @@ -8,6 +8,7 @@ PROG= ar SRCS= ar.c not-ranlib.c +CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd LDADD+= -L${RELTOP}/libbinutils -lbinutils diff --git a/gnu/usr.bin/binutils/ar/Makefile.i386 b/gnu/usr.bin/binutils/ar/Makefile.i386 new file mode 100644 index 000000000000..a23f65695926 --- /dev/null +++ b/gnu/usr.bin/binutils/ar/Makefile.i386 @@ -0,0 +1,5 @@ +# +# $Id$ +# + +BINDIR= /usr/libexec/elf -- cgit v1.3