diff options
| author | Thorsten Lockert <tholo@cvs.openbsd.org> | 1996-06-02 05:54:39 +0000 |
|---|---|---|
| committer | Thorsten Lockert <tholo@cvs.openbsd.org> | 1996-06-02 05:54:39 +0000 |
| commit | 64648b6604c28f2e7f4d9152043c0efd148474d6 (patch) | |
| tree | ed2e5c039efde87e1703e750926b58662fc6a740 /usr.bin | |
| parent | 7e2fc8ed2758bd15f0698407d69eb61815a7a892 (diff) | |
Always use -ltermlib when linking with -lcurses
Be consistent in use of LIBTERMCAP and LIBTERMLIB when depending
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/msgs/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/systat/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/talk/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/tn3270/tn3270/Makefile | 10 | ||||
| -rw-r--r-- | usr.bin/vi/build/Makefile | 3 |
5 files changed, 13 insertions, 12 deletions
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile index 51dd4fb06fd..17e2ded2b41 100644 --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -2,7 +2,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/28/95 PROG= msgs -DPADD= ${LIBTERM} -LDADD= -ltermlib +DPADD= ${LIBTERMCAP} +LDADD= -ltermcap .include <bsd.prog.mk> diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index de284f26bbb..33a391f724b 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1996/05/22 11:35:28 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1996/06/02 05:54:36 tholo Exp $ # $NetBSD: Makefile,v 1.5 1996/05/10 23:16:30 thorpej Exp $ PROG= systat @@ -8,8 +8,8 @@ PROG= systat CFLAGS+=-I${.CURDIR}/../../usr.bin/vmstat SRCS= cmds.c cmdtab.c disks.c dkstats.c fetch.c iostat.c keyboard.c \ main.c mbufs.c netcmds.c netstat.c pigs.c swap.c vmstat.c -DPADD= ${LIBCURSES} ${LIBTERMCAP} ${LIBM} ${LIBKVM} -LDADD= -lcurses -ltermcap -lm -lkvm +DPADD= ${LIBCURSES} ${LIBTERMLIB} ${LIBM} ${LIBKVM} +LDADD= -lcurses -ltermlib -lm -lkvm BINGRP= kmem BINMODE=2555 diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile index 439e3832b6a..3a28ecb382f 100644 --- a/usr.bin/talk/Makefile +++ b/usr.bin/talk/Makefile @@ -2,7 +2,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= talk -DPADD= ${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT} +DPADD= ${LIBCURSES} ${LIBTERMLIB} ${LIBCOMPAT} LDADD= -lcurses -ltermlib -lcompat SRCS= ctl.c ctl_transact.c display.c get_addrs.c get_names.c \ init_disp.c invite.c io.c look_up.c msgs.c talk.c diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile index 0ffaa587fa7..030b1ea8758 100644 --- a/usr.bin/tn3270/tn3270/Makefile +++ b/usr.bin/tn3270/tn3270/Makefile @@ -1,12 +1,12 @@ -# $Id: Makefile,v 1.3 1996/02/15 05:02:29 etheisen Exp $ +# $Id: Makefile,v 1.4 1996/06/02 05:54:38 tholo Exp $ .include "../../Makefile.inc" CFLAGS += -I${.CURDIR} -I. -#LDADD += -lcurses -ltermcap -ltelnet -lcrypt -LDADD += -lcurses -ltermcap -ltelnet -#DPADD += ${LIBCURSES} ${LIBTERMCAP} /usr/lib/libtelnet.a ${LIBCRYPT} -DPADD += ${LIBCURSES} ${LIBTERMCAP} /usr/lib/libtelnet.a +#LDADD += -lcurses -ltermlib -ltelnet -lcrypt +LDADD += -lcurses -ltermlib -ltelnet +#DPADD += ${LIBCURSES} ${LIBTERMLIB} /usr/lib/libtelnet.a ${LIBCRYPT} +DPADD += ${LIBCURSES} ${LIBTERMLIB} /usr/lib/libtelnet.a SRCS += apilib.c api_bsd.c api_exch.c asc_ebc.c astosc.c dctype.c SRCS += disp_asc.c ebc_disp.c diff --git a/usr.bin/vi/build/Makefile b/usr.bin/vi/build/Makefile index 0087d045fe0..2253b637980 100644 --- a/usr.bin/vi/build/Makefile +++ b/usr.bin/vi/build/Makefile @@ -4,7 +4,8 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include -LDADD+= -lcurses -ltermcap +LDADD+= -lcurses -ltermlib +DPADD+= ${LIBCURSES} ${LIBTERMLIB} PROG= vi SRCS= cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \ cut.c delete.c ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c \ |