Add dependencies on libraries to DPADD. Someday this should be done

automagically.  -lfoo has to be right to work, but ${LIBFO0} is too
easy to forget or misspell; nothing checks it and it should be
different for shared libraries.
This commit is contained in:
Bruce Evans 1994-08-28 18:49:06 +00:00
parent a8c32ea5a1
commit 2577a8acef
16 changed files with 29 additions and 17 deletions

View File

@ -6,6 +6,7 @@ SRCS= alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \
mystring.c nodes.c options.c parser.c printf.c redir.c show.c \
signames.c syntax.c trap.c output.c var.c
OBJS+= init.o arith.o arith_lex.o
DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP} ${LIBCOMPAT}
LDADD= -ll -ledit -ltermcap -lcompat
LFLAGS= -8 # 8-bit lex scanner for arithmetic
CFLAGS+=-DSHELL -I. -I${.CURDIR}

View File

@ -10,3 +10,13 @@ CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"i386--freebsd\"
CFLAGS+= -DMD_EXEC_PREFIX=\"/usr/libexec/\"
CFLAGS+= -DSTANDARD_STARTFILE_PREFIX=\"/usr/lib\"
CFLAGS+= -DGCC_NAME=\"cc\"
.if exists(${.CURDIR}/../cc_int/obj)
LIBDESTDIR= ${.CURDIR}/../cc_int/obj
.else
LIBDESTDIR= ${.CURDIR}/../cc_int
.endif
# XXX LDDESTDIR isn't a directory and there is no standard name for the dir
LDDESTDIR= -L${LIBDESTDIR}
LIBCC_INT= ${LIBDESTDIR}/libcc_int.a

View File

@ -6,8 +6,7 @@ PROG = c++
SRCS = g++.c
BINDIR= /usr/bin
NOMAN= 1
LDDESTDIR+= -L${.CURDIR}/../cc_int/obj
LDDESTDIR+= -L${.CURDIR}/../cc_int
DPADD+= ${LIBCC_INT}
LDADD+= -lcc_int
.include <bsd.prog.mk>

View File

@ -5,8 +5,7 @@
PROG = cc
SRCS = gcc.c
BINDIR= /usr/bin
LDDESTDIR+= -L${.CURDIR}/../cc_int/obj
LDDESTDIR+= -L${.CURDIR}/../cc_int
DPADD+= ${LIBCC_INT}
LDADD+= -lcc_int
.include <bsd.prog.mk>

View File

@ -6,8 +6,7 @@ PROG = cc1
SRCS = c-aux-info.c c-convert.c c-decl.c c-iterate.c c-lang.c c-lex.c c-parse.c c-pragma.c c-typeck.c
BINDIR= /usr/libexec
NOMAN= 1
LDDESTDIR+= -L${.CURDIR}/../cc_int/obj
LDDESTDIR+= -L${.CURDIR}/../cc_int
DPADD+= ${LIBCC_INT}
LDADD+= -lcc_int
.include <bsd.prog.mk>

View File

@ -6,8 +6,7 @@ PROG = cc1plus
SRCS = call.c class.c cvt.c decl.c decl2.c edsel.c errfn.c error.c except.c expr.c gc.c init.c lex.c method.c parse.c pt.c ptree.c search.c sig.c spew.c tree.c typeck.c typeck2.c xref.c
BINDIR= /usr/libexec
NOMAN= 1
LDDESTDIR+= -L${.CURDIR}/../cc_int/obj
LDDESTDIR+= -L${.CURDIR}/../cc_int
DPADD+= ${LIBCC_INT}
LDADD+= -lcc_int
.include <bsd.prog.mk>

View File

@ -5,8 +5,7 @@
PROG = cpp
SRCS = cccp.c cexp.c
BINDIR= /usr/libexec
LDDESTDIR+= -L${.CURDIR}/../cc_int/obj
LDDESTDIR+= -L${.CURDIR}/../cc_int
DPADD+= ${LIBCC_INT}
LDADD+= -lcc_int
.include <bsd.prog.mk>

View File

@ -5,8 +5,7 @@
PROG = cpp
SRCS = cccp.c cexp.c
BINDIR= /usr/libexec
LDDESTDIR+= -L${.CURDIR}/../cc_int/obj
LDDESTDIR+= -L${.CURDIR}/../cc_int
DPADD+= ${LIBCC_INT}
LDADD+= -lcc_int
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.10 1994/03/10 23:19:54 ats Exp $
# $Id: Makefile,v 1.11 1994/08/26 19:11:14 wollman Exp $
PROG= ld.so
SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c
@ -9,6 +9,7 @@ PICFLAG=-fpic
CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) $(PICFLAG) -DRTLD
LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
ASFLAGS+=-k
DPADD+= ${LIBC:S/c.a/c_pic.a/} ${LIBC:S/c.a/gcc_pic.a/}
LDADD+= -lc_pic -lgcc_pic
BINDIR= /usr/libexec
INSTALLFLAGS+= -fschg
@ -17,7 +18,7 @@ INSTALLFLAGS+= -fschg
.PATH: $(LDDIR) $(LDDIR)/$(MACHINE)
$(PROG):
$(PROG): ${OBJS} ${DPADD}
$(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LDADD)
.S.o:

View File

@ -46,7 +46,7 @@ editline.c: ${OSRCS}
.depend: vi.h emacs.h common.h fcns.h help.h help.c
test: libedit.a test.o
test: test.o libedit.a ${DPADD} ${LIBTERM}
${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermcap
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.10 1994/03/10 23:19:54 ats Exp $
# $Id: Makefile,v 1.11 1994/08/26 19:11:14 wollman Exp $
PROG= ld.so
SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c
@ -9,6 +9,7 @@ PICFLAG=-fpic
CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) $(PICFLAG) -DRTLD
LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
ASFLAGS+=-k
DPADD+= ${LIBC:S/c.a/c_pic.a/} ${LIBC:S/c.a/gcc_pic.a/}
LDADD+= -lc_pic -lgcc_pic
BINDIR= /usr/libexec
INSTALLFLAGS+= -fschg
@ -17,7 +18,7 @@ INSTALLFLAGS+= -fschg
.PATH: $(LDDIR) $(LDDIR)/$(MACHINE)
$(PROG):
$(PROG): ${OBJS} ${DPADD}
$(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LDADD)
.S.o:

View File

@ -2,6 +2,7 @@
PROG= gcore
SRCS= gcore.c
DPADD= ${LIBKVM}
LDADD= -lkvm
.if ${MACHINE} != "sparc"

View File

@ -8,6 +8,7 @@
PROG= egrep
CFLAGS+=-Dstrrchr=rindex -Dstrchr=index -DNOKANJI
DPADD= ${LIBCOMPAT}
LDADD= -lcompat # must search compat to get spencers early regexp package
MAN1= grep.1
LINKS= ${BINDIR}/egrep ${BINDIR}/grep ${BINDIR}/egrep ${BINDIR}/fgrep

View File

@ -3,6 +3,7 @@
PROG= lock
BINOWN= root
BINMODE=4555
DPADD= ${LIBCRYPT}
LDADD= -lcrypt
.include <bsd.prog.mk>

View File

@ -1,5 +1,6 @@
PROG= kbdcontrol
SRCS= kbdcontrol.c lex.l
DPADD+= ${LIBL}
LDADD+= -ll
.include <bsd.prog.mk>

View File

@ -13,6 +13,7 @@ SRCS= version.c addrtoname.c bpf_dump.c bpf_filter.c bpf_image.c etherent.c \
tcplex.c util.c
.PATH: /sys/net
CLEANFILES+= tcpgram.c tcplex.c y.tab.h y.tab.c version.c version.h
DPADD+= ${LIBL}
LDADD+= -ll
version.c version.h: VERSION