From cc59b11e0f4c53d45ce5b8eadf06576ed0644e6a Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 11 Apr 2003 18:02:10 +0000 Subject: [PATCH] libbinutils.a needs basename(3); when the latter is provided by -legacy, liblegacy.a should come last in the LDADD list. --- gnu/usr.bin/binutils/addr2line/Makefile | 7 ++++--- gnu/usr.bin/binutils/ar/Makefile | 7 ++++--- gnu/usr.bin/binutils/as/Makefile.inc0 | 7 ++++--- gnu/usr.bin/binutils/ld/Makefile | 5 +++-- gnu/usr.bin/binutils/nm/Makefile | 7 ++++--- gnu/usr.bin/binutils/objcopy/Makefile | 7 ++++--- gnu/usr.bin/binutils/objdump/Makefile | 9 +++++---- gnu/usr.bin/binutils/ranlib/Makefile | 7 ++++--- gnu/usr.bin/binutils/readelf/Makefile | 7 ++++--- gnu/usr.bin/binutils/size/Makefile | 7 ++++--- gnu/usr.bin/binutils/strings/Makefile | 7 ++++--- gnu/usr.bin/binutils/strip/Makefile | 7 ++++--- 12 files changed, 48 insertions(+), 36 deletions(-) diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile index 69888570e686..416c8fe9bea7 100644 --- a/gnu/usr.bin/binutils/addr2line/Makefile +++ b/gnu/usr.bin/binutils/addr2line/Makefile @@ -9,9 +9,10 @@ SRCS= addr2line.c WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile index d1e6493954fd..8faeb8a4974d 100644 --- a/gnu/usr.bin/binutils/ar/Makefile +++ b/gnu/usr.bin/binutils/ar/Makefile @@ -10,9 +10,10 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd NOSHARED?= yes -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0 index ccd94ab226c5..5c2d770f5ae0 100644 --- a/gnu/usr.bin/binutils/as/Makefile.inc0 +++ b/gnu/usr.bin/binutils/as/Makefile.inc0 @@ -20,9 +20,10 @@ CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/.. CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" NOSHARED?= yes -DPADD= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a +DPADD:= ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${RELTOP}/libopcodes/libopcodes.a \ + ${DPADD} LDADD= ${DPADD} # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index 036cacb14a17..9b55fd1c767f 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -15,8 +15,9 @@ CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd NOSHARED?= yes -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} CLEANDIRS+= ldscripts CLEANFILES+= ldemul-list.h stringify.sed diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile index ef2f2d68e6e9..a98d92bc4940 100644 --- a/gnu/usr.bin/binutils/nm/Makefile +++ b/gnu/usr.bin/binutils/nm/Makefile @@ -10,9 +10,10 @@ WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile index dfa04f520c62..98f4b0ca47b0 100644 --- a/gnu/usr.bin/binutils/objcopy/Makefile +++ b/gnu/usr.bin/binutils/objcopy/Makefile @@ -9,9 +9,10 @@ SRCS= objcopy.c not-strip.c WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile index 4a1d6a37de9e..2db70f3189e0 100644 --- a/gnu/usr.bin/binutils/objdump/Makefile +++ b/gnu/usr.bin/binutils/objdump/Makefile @@ -10,10 +10,11 @@ WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libopcodes/libopcodes.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile index 960b130d548d..2420e5872b56 100644 --- a/gnu/usr.bin/binutils/ranlib/Makefile +++ b/gnu/usr.bin/binutils/ranlib/Makefile @@ -10,9 +10,10 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd NOSHARED?= yes -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile index 96012463f056..7140826dd58a 100644 --- a/gnu/usr.bin/binutils/readelf/Makefile +++ b/gnu/usr.bin/binutils/readelf/Makefile @@ -12,9 +12,10 @@ SRCS= ${PROG}.c WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile index a0ef3171ed40..b502c472a12a 100644 --- a/gnu/usr.bin/binutils/size/Makefile +++ b/gnu/usr.bin/binutils/size/Makefile @@ -9,9 +9,10 @@ SRCS= size.c WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile index 346e59fcf978..0da55c4ea613 100644 --- a/gnu/usr.bin/binutils/strings/Makefile +++ b/gnu/usr.bin/binutils/strings/Makefile @@ -9,9 +9,10 @@ SRCS= strings.c WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} .include diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile index c059b4bace12..693e13b7f2a2 100644 --- a/gnu/usr.bin/binutils/strip/Makefile +++ b/gnu/usr.bin/binutils/strip/Makefile @@ -9,9 +9,10 @@ SRCS= objcopy.c is-strip.c WARNS= 2 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD:= ${RELTOP}/libbinutils/libbinutils.a \ + ${RELTOP}/libbfd/libbfd.a \ + ${RELTOP}/libiberty/libiberty.a \ + ${DPADD} LDADD= ${DPADD} CLEANFILES+= maybe_stripped