diff options
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/ftp/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/more/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/msgs/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/systat/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/talk/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/telnet/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/tn3270/tn3270/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/top/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/tput/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/tset/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/ul/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/window/Makefile | 6 |
12 files changed, 35 insertions, 35 deletions
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 813d109deb9..b8917deac29 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 1997/10/02 04:22:39 imp Exp $ +# $OpenBSD: Makefile,v 1.15 1998/07/24 00:10:54 millert Exp $ # Define SMALL to disable command line editing #CFLAGS+=-DSMALL @@ -15,8 +15,8 @@ PROG= ftp SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \ stringlist.c util.c -LDADD+= -ledit -ltermcap -DPADD+= ${LIBEDIT} ${LIBTERMCAP} +LDADD+= -ledit -lcurses +DPADD+= ${LIBEDIT} ${LIBCURSES} #COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile index b7611c240f1..1b4f23429f8 100644 --- a/usr.bin/more/Makefile +++ b/usr.bin/more/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 1997/09/21 11:50:08 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 1998/07/24 00:10:55 millert Exp $ PROG= more -DPADD= ${LIBTERM} ${LIBCOMPAT} -LDADD= -ltermcap -lcompat +DPADD= ${LIBCURSES} ${LIBCOMPAT} +LDADD= -lcurses -lcompat MLINKS= more.1 page.1 LINKS= ${BINDIR}/more ${BINDIR}/page diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile index f73804fb5b0..1c3619a0feb 100644 --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 1997/09/21 11:50:11 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 1998/07/24 00:10:57 millert Exp $ PROG= msgs DPADD= ${LIBTERMLIB} -LDADD= -ltermlib +LDADD= -lcurses .include <bsd.prog.mk> diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index 1a9c99db68e..2d7e987d8f1 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 1998/01/05 00:01:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 1998/07/24 00:10:58 millert Exp $ PROG= systat @@ -7,8 +7,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} ${LIBTERMLIB} ${LIBM} ${LIBKVM} -LDADD= -lcurses -ltermlib -lm -lkvm +DPADD= ${LIBCURSES} ${LIBM} ${LIBKVM} +LDADD= -lcurses -lm -lkvm BINGRP= kmem BINMODE=2555 diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile index 42cc2c0f6d4..b5ddb5c8d44 100644 --- a/usr.bin/talk/Makefile +++ b/usr.bin/talk/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 1998/04/27 15:45:47 pjanzen Exp $ +# $OpenBSD: Makefile,v 1.6 1998/07/24 00:11:00 millert Exp $ PROG= talk -DPADD= ${LIBCURSES} ${LIBTERMLIB} -LDADD= -lcurses -ltermlib +DPADD= ${LIBCURSES} +LDADD= -lcurses 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/telnet/Makefile b/usr.bin/telnet/Makefile index a8db8d78724..229a71b1240 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1998/03/12 04:57:26 art Exp $ +# $OpenBSD: Makefile,v 1.7 1998/07/24 00:11:01 millert Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -39,8 +39,8 @@ PROG= telnet CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DSKEY -Dunix CFLAGS+=-DENV_HACK CFLAGS+=-I${.CURDIR}/../../lib -LDADD+= -ltermcap -ltelnet -DPADD= ${LIBTERMCAP} ${LIBTELNET} +LDADD+= -lcurses -ltelnet +DPADD= ${LIBCURSES} ${LIBTELNET} SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ terminal.c tn3270.c utilities.c diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile index 2fd1fb1232f..2ee34b27e31 100644 --- a/usr.bin/tn3270/tn3270/Makefile +++ b/usr.bin/tn3270/tn3270/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.11 1998/03/23 21:18:22 pefo Exp $ +# $OpenBSD: Makefile,v 1.12 1998/07/24 00:11:02 millert Exp $ .include "../../Makefile.inc" CFLAGS += -I${.CURDIR} -I. CFLAGS +=-I${.CURDIR}/../../../lib CFLAGS +=-I${.CURDIR}/../../telnet -LDADD += -locurses -ltermcap -ltelnet -DPADD += ${LIBOLDCURSES} ${LIBTERMCAP} ${LIBTELNET} +LDADD += -locurses -ltelnet +DPADD += ${LIBOLDCURSES} ${LIBTELNET} 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/top/Makefile b/usr.bin/top/Makefile index cc71f6d7a35..13211746938 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 1997/08/17 01:01:59 downsj Exp $ +# $OpenBSD: Makefile,v 1.3 1998/07/24 00:11:04 millert Exp $ # # Makefile for OpenBSD top-3.4. @@ -7,8 +7,8 @@ PROG= top CFLAGS+=-I. -I${.CURDIR} SRCS= commands.c display.c machine.c screen.c top.c username.c utils.c \ version.c -DPADD= ${LIBTERMLIB} ${LIBM} ${LIBKVM} -LDADD= -ltermlib -lm -lkvm +DPADD= ${LIBCURSES} ${LIBM} ${LIBKVM} +LDADD= -lcurses -lm -lkvm BINGRP= kmem BINMODE=2555 diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile index 5ad0bfdc0c4..caa7670dea1 100644 --- a/usr.bin/tput/Makefile +++ b/usr.bin/tput/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 1997/09/21 11:51:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 1998/07/24 00:11:05 millert Exp $ PROG= tput -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBCURSES} +LDADD= -lcurses MLINKS= tput.1 clear.1 LINKS= ${BINDIR}/tput ${BINDIR}/clear diff --git a/usr.bin/tset/Makefile b/usr.bin/tset/Makefile index 1d5849a8b6a..33c4125b150 100644 --- a/usr.bin/tset/Makefile +++ b/usr.bin/tset/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:24 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1998/07/24 00:11:06 millert Exp $ PROG= tset SRCS= map.c misc.c set.c term.c tset.c wrterm.c -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBCURSES} +LDADD= -lcurses LINKS= ${BINDIR}/tset ${BINDIR}/reset MLINKS= tset.1 reset.1 diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile index ce63bdc3020..bab290cd8ae 100644 --- a/usr.bin/ul/Makefile +++ b/usr.bin/ul/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:28 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1998/07/24 00:11:08 millert Exp $ PROG= ul -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBCURSES} +LDADD= -lcurses .include <bsd.prog.mk> diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile index 2dc602fc8bd..9c56e0e50d5 100644 --- a/usr.bin/window/Makefile +++ b/usr.bin/window/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 1997/09/21 11:52:06 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 1998/07/24 00:11:09 millert Exp $ PROG= window SRCS= char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \ @@ -15,7 +15,7 @@ SRCS= char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \ wwterminfo.c wwtty.c wwunframe.c wwupdate.c wwwrite.c xx.c xxflush.c \ compress.c MAN= window.1 -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBCURSES} +LDADD= -lcurses .include <bsd.prog.mk> |