Use ${dir}/libfoo.a' instead of -L${dir} -lfoo' for local static

libraries in LDADD so that `make checkdpadd' doesn't report non-errors.

Fixed some style bugs (the usual ones for DPADD and LDADD, and misformatting
of $FreeBSD$).
This commit is contained in:
Bruce Evans 2000-03-27 18:02:04 +00:00
parent dc1c41d0a8
commit 6a18627411
13 changed files with 31 additions and 77 deletions

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -10,11 +8,9 @@ PROG= addr2line
SRCS= addr2line.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -11,11 +9,9 @@ SRCS= ar.c not-ranlib.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -I${SRCDIR}/bfd
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "${.CURDIR}/../../Makefile.inc0"
@ -19,12 +17,10 @@ CFLAGS+= -I${SRCDIR}/gas
CFLAGS+= -I${SRCDIR}/gas/config
CFLAGS+= -I${SRCDIR}
CFLAGS+= -DVERSION=\"${VERSION}\"
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
LDADD+= -L${RELTOP}/libopcodes -lopcodes
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
DPADD+= ${RELTOP}/libopcodes/libopcodes.a
LDADD= ${DPADD}
# If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
# binutils release. FreeBSD only distributes the bits that are required to

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -13,7 +11,7 @@ CFLAGS+= -I${SRCDIR}/gas
CFLAGS+= -I${SRCDIR}/gas/config
CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd
CFLAGS+= -DBFD_ASSEMBLER
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libiberty/libiberty.a
DPADD= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -34,18 +34,18 @@ CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -I${SRCDIR}/bfd
CFLAGS+= -I${GDBDIR}/gdb
CFLAGS+= -I${GDBDIR}/gdb/config
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libopcodes -lopcodes
LDADD+= -lreadline
LDADD+= -lgnuregex
LDADD+= -L${RELTOP}/libiberty -liberty
LDADD+= -ltermcap
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libopcodes/libopcodes.a
DPADD+= ${LIBREADLINE}
DPADD+= ${LIBGNUREGEX}
DPADD+= ${RELTOP}/libiberty/libiberty.a
DPADD+= ${LIBTERMCAP}
LDADD= ${RELTOP}/libbfd/libbfd.a
LDADD+= ${RELTOP}/libopcodes/libopcodes.a
LDADD+= -lreadline
LDADD+= -lgnuregex
LDADD+= ${RELTOP}/libiberty/libiberty.a
LDADD+= -ltermcap
GDBDIR= ${.CURDIR}/../../../../contrib/gdb
.PATH: ${GDBDIR}/gdb

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -13,10 +11,9 @@ SRCS+= ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \
ldver.c ldwrite.c lexsup.c mri.c
CFLAGS+= -DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
CFLAGS+= -I${SRCDIR}/ld
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
CLEANDIRS+= ldscripts
CLEANFILES+= ldemul-list.h

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -10,11 +8,9 @@ PROG= nm
SRCS= nm.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -10,11 +8,9 @@ PROG= objcopy
SRCS= objcopy.c not-strip.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -10,13 +8,10 @@ PROG= objdump
SRCS= objdump.c prdbg.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libopcodes -lopcodes
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libopcodes/libopcodes.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -11,11 +9,9 @@ SRCS= ar.o is-ranlib.o
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -I${SRCDIR}/bfd
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -10,11 +8,9 @@ PROG= size
SRCS= size.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -10,11 +8,9 @@ PROG= strings
SRCS= strings.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>

View File

@ -1,6 +1,4 @@
#
# $FreeBSD$
#
.include "../Makefile.inc0"
@ -10,12 +8,10 @@ PROG= strip
SRCS= objcopy.c is-strip.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
LDADD+= -L${RELTOP}/libbinutils -lbinutils
LDADD+= -L${RELTOP}/libbfd -lbfd
LDADD+= -L${RELTOP}/libiberty -liberty
DPADD+= ${RELTOP}/libbinutils/libbinutils.a
DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
CLEANFILES+= maybe_stripped
all: maybe_stripped