diff options
author | bde <bde@FreeBSD.org> | 2000-03-27 18:02:04 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2000-03-27 18:02:04 +0000 |
commit | 3df6f40aa1cf6e95d7b83c659df524537d53e5fa (patch) | |
tree | fbf8248b0682cbefeb964352cc37b960ae30f459 /gnu | |
parent | a8264e58beab51434a6addf13fc92b0a7423f9ab (diff) | |
download | FreeBSD-src-3df6f40aa1cf6e95d7b83c659df524537d53e5fa.zip FreeBSD-src-3df6f40aa1cf6e95d7b83c659df524537d53e5fa.tar.gz |
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$).
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/binutils/addr2line/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/ar/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/as/Makefile.inc0 | 8 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/gasp/Makefile | 6 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/gdb/Makefile | 14 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/ld/Makefile | 7 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/nm/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/objcopy/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/objdump/Makefile | 9 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/ranlib/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/size/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/strings/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/strip/Makefile | 8 |
13 files changed, 31 insertions, 77 deletions
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile index 51bc7b9..ec64289 100644 --- a/gnu/usr.bin/binutils/addr2line/Makefile +++ b/gnu/usr.bin/binutils/addr2line/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile index 6039e4b..14090be 100644 --- a/gnu/usr.bin/binutils/ar/Makefile +++ b/gnu/usr.bin/binutils/ar/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0 index cdcd466..b98400b 100644 --- a/gnu/usr.bin/binutils/as/Makefile.inc0 +++ b/gnu/usr.bin/binutils/as/Makefile.inc0 @@ -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 diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile index 96e3576..04d4a7b 100644 --- a/gnu/usr.bin/binutils/gasp/Makefile +++ b/gnu/usr.bin/binutils/gasp/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile index 37ae322..c31e956 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile +++ b/gnu/usr.bin/binutils/gdb/Makefile @@ -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 diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index 0711510..b9396ca 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -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 diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile index 2d2e263..39d36c6 100644 --- a/gnu/usr.bin/binutils/nm/Makefile +++ b/gnu/usr.bin/binutils/nm/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile index ca05034..e8bd30b 100644 --- a/gnu/usr.bin/binutils/objcopy/Makefile +++ b/gnu/usr.bin/binutils/objcopy/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile index 9635b35..2608fa2 100644 --- a/gnu/usr.bin/binutils/objdump/Makefile +++ b/gnu/usr.bin/binutils/objdump/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile index f3f0850..e8a10a5 100644 --- a/gnu/usr.bin/binutils/ranlib/Makefile +++ b/gnu/usr.bin/binutils/ranlib/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile index 9109a76..d88f30a 100644 --- a/gnu/usr.bin/binutils/size/Makefile +++ b/gnu/usr.bin/binutils/size/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile index e163cdb..ea5e864 100644 --- a/gnu/usr.bin/binutils/strings/Makefile +++ b/gnu/usr.bin/binutils/strings/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile index 421a3d4..a0a935e 100644 --- a/gnu/usr.bin/binutils/strip/Makefile +++ b/gnu/usr.bin/binutils/strip/Makefile @@ -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 |