diff options
| author | bde <bde@FreeBSD.org> | 1998-03-07 08:55:00 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-03-07 08:55:00 +0000 |
| commit | 6682846885f7b3347088fca27d9c55c86426311e (patch) | |
| tree | 2d8dfb6b69578f3b240ed91f714ecc557fb116f9 /gnu | |
| parent | 1bc27d95394df5d8e70e98c32a02cafeb0930aea (diff) | |
| download | FreeBSD-src-6682846885f7b3347088fca27d9c55c86426311e.zip FreeBSD-src-6682846885f7b3347088fca27d9c55c86426311e.tar.gz | |
Use `foo/bar.a' instead of `-Lfoo -lbar' for linking to static internal
libraries, so that `ld -f' in can create correct dependencies for
yet-to-be-built libraries.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/binutils/gdb/Makefile | 31 | ||||
| -rw-r--r-- | gnu/usr.bin/gdb/gdb/Makefile | 31 |
2 files changed, 18 insertions, 44 deletions
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile index 90b5696..e922588 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile +++ b/gnu/usr.bin/binutils/gdb/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.28 1997/05/02 11:22:51 gj Exp $ +# $Id: Makefile,v 1.29 1997/10/05 09:39:10 jkh Exp $ PROG = gdb @@ -43,34 +43,21 @@ CLEANFILES+= c-exp.c f-exp.c m2-exp.c init.c y.tab.h init.c-tmp .ORDER: c-exp.c f-exp.c m2-exp.c .if exists(${.OBJDIR}/../bfd) -LDADD+= -L${.OBJDIR}/../bfd -lbfd -DPADD+= ${.OBJDIR}/../bfd/libbfd.a +LIBBFD= ${.OBJDIR}/../bfd/libbfd.a .else -LDADD+= -L${.CURDIR}/../bfd/ -lbfd -DPADD+= ${.CURDIR}/../bfd/libbfd.a +LIBBFD= ${.CURDIR}/../bfd/libbfd.a .endif -DPADD+= ${LIBREADLINE} ${LIBGNUREGEX} -LDADD+= -lreadline -lgnuregex - .if exists(${.OBJDIR}/../libiberty) -LDADD+= -L${.OBJDIR}/../libiberty -liberty -DPADD+= ${.OBJDIR}/../libiberty/libiberty.a +LIBIBERTY= ${.OBJDIR}/../libiberty/libiberty.a .else -LDADD+= -L${.CURDIR}/../libiberty/ -liberty -DPADD+= ${.CURDIR}/../libiberty/libiberty.a +LIBIBERTY= ${.CURDIR}/../libiberty/libiberty.a .endif -DPADD+= ${LIBTERMCAP} -LDADD+= -ltermcap - -.if exists(${.OBJDIR}/../libiberty) -LDADD+= -L${.OBJDIR}/../libiberty -liberty -DPADD+= ${.OBJDIR}/../libiberty/libiberty.a -.else -LDADD+= -L${.CURDIR}/../libiberty/ -liberty -DPADD+= ${.CURDIR}/../libiberty/libiberty.a -.endif +DPADD= ${LIBBFD} ${LIBREADLINE} ${LIBGNUREGEX} ${LIBIBERTY} ${LIBTERMCAP} +LDADD= ${LIBBFD} -lreadline -lgnuregex ${LIBIBERTY} -ltermcap +DPADD+= ${LIBIBERTY} +LDADD+= ${LIBIBERTY} # We do this by grepping through sources. If that turns out to be too slow, # maybe we could just require every .o file to have an initialization routine diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile index 90b5696..e922588 100644 --- a/gnu/usr.bin/gdb/gdb/Makefile +++ b/gnu/usr.bin/gdb/gdb/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.28 1997/05/02 11:22:51 gj Exp $ +# $Id: Makefile,v 1.29 1997/10/05 09:39:10 jkh Exp $ PROG = gdb @@ -43,34 +43,21 @@ CLEANFILES+= c-exp.c f-exp.c m2-exp.c init.c y.tab.h init.c-tmp .ORDER: c-exp.c f-exp.c m2-exp.c .if exists(${.OBJDIR}/../bfd) -LDADD+= -L${.OBJDIR}/../bfd -lbfd -DPADD+= ${.OBJDIR}/../bfd/libbfd.a +LIBBFD= ${.OBJDIR}/../bfd/libbfd.a .else -LDADD+= -L${.CURDIR}/../bfd/ -lbfd -DPADD+= ${.CURDIR}/../bfd/libbfd.a +LIBBFD= ${.CURDIR}/../bfd/libbfd.a .endif -DPADD+= ${LIBREADLINE} ${LIBGNUREGEX} -LDADD+= -lreadline -lgnuregex - .if exists(${.OBJDIR}/../libiberty) -LDADD+= -L${.OBJDIR}/../libiberty -liberty -DPADD+= ${.OBJDIR}/../libiberty/libiberty.a +LIBIBERTY= ${.OBJDIR}/../libiberty/libiberty.a .else -LDADD+= -L${.CURDIR}/../libiberty/ -liberty -DPADD+= ${.CURDIR}/../libiberty/libiberty.a +LIBIBERTY= ${.CURDIR}/../libiberty/libiberty.a .endif -DPADD+= ${LIBTERMCAP} -LDADD+= -ltermcap - -.if exists(${.OBJDIR}/../libiberty) -LDADD+= -L${.OBJDIR}/../libiberty -liberty -DPADD+= ${.OBJDIR}/../libiberty/libiberty.a -.else -LDADD+= -L${.CURDIR}/../libiberty/ -liberty -DPADD+= ${.CURDIR}/../libiberty/libiberty.a -.endif +DPADD= ${LIBBFD} ${LIBREADLINE} ${LIBGNUREGEX} ${LIBIBERTY} ${LIBTERMCAP} +LDADD= ${LIBBFD} -lreadline -lgnuregex ${LIBIBERTY} -ltermcap +DPADD+= ${LIBIBERTY} +LDADD+= ${LIBIBERTY} # We do this by grepping through sources. If that turns out to be too slow, # maybe we could just require every .o file to have an initialization routine |
