summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1994-09-11 22:01:45 +0000
committerrgrimes <rgrimes@FreeBSD.org>1994-09-11 22:01:45 +0000
commit95020286b602a7b5fd8b28d6619241c13b032b6c (patch)
treeb5d7a4da0b756d6e402d0c19286d792da70937c5
parent83c1bfeaebd9b736f4275febd1bfda3af777646c (diff)
downloadFreeBSD-src-95020286b602a7b5fd8b28d6619241c13b032b6c.zip
FreeBSD-src-95020286b602a7b5fd8b28d6619241c13b032b6c.tar.gz
Change all references to LIBTERM and -ltermlib to LIBTERMCAP and -ltermcap
-rw-r--r--usr.bin/more/Makefile2
-rw-r--r--usr.bin/msgs/Makefile4
-rw-r--r--usr.bin/talk/Makefile2
-rw-r--r--usr.bin/tn3270/distribution/makefile_4.24
-rw-r--r--usr.bin/vi/common/Makefile6
5 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 58f9e81..bae015d 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -5,7 +5,7 @@ CFLAGS+=-I${.CURDIR}
SRCS= ch.c command.c decode.c help.c input.c line.c linenum.c main.c \
option.c os.c output.c position.c prim.c screen.c signal.c tags.c \
ttyin.c
-DPADD= ${LIBTERM} ${LIBCOMPAT}
+DPADD= ${LIBTERMCAP} ${LIBCOMPAT}
LDADD= -ltermcap -lcompat
beforeinstall:
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 09ef68d..bcc230e 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= msgs
-DPADD= ${LIBTERM} ${LIBCOMPAT}
-LDADD= -ltermlib -lcompat
+DPADD= ${LIBTERMCAP} ${LIBCOMPAT}
+LDADD= -ltermcap -lcompat
.include <bsd.prog.mk>
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index d86cd02..27a39ae 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -2,7 +2,7 @@
PROG= talk
DPADD= ${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
-LDADD= -lcurses -ltermlib -lcompat
+LDADD= -lcurses -ltermcap -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/distribution/makefile_4.2 b/usr.bin/tn3270/distribution/makefile_4.2
index b8e5eb8e..9f35a6c 100644
--- a/usr.bin/tn3270/distribution/makefile_4.2
+++ b/usr.bin/tn3270/distribution/makefile_4.2
@@ -106,7 +106,7 @@ BINDIR = $(DESTDIR)/usr/ucb
# Names for the terminal libraries...
LIBCURSES = -lcurses
-LIBTERM = -ltermlib
+LIBTERMCAP = -ltermcap
#PC_LIBCURSES =
#PC_LIBTERM =
@@ -156,7 +156,7 @@ FRC:
tn3270$X: telnet/telprog.o ${SUBLIB} api/apilib.a
${CC} ${CFLAGS} -o tn3270 telnet/telprog.o \
- $L ${SUBLIB} api/apilib.a $(LIBCURSES) $(LIBTERM)
+ $L ${SUBLIB} api/apilib.a ${LIBCURSES} ${LIBTERMCAP}
#PC_tn3270$X:
#PC_ link <@<
diff --git a/usr.bin/vi/common/Makefile b/usr.bin/vi/common/Makefile
index f5f2c2b..3a28b44 100644
--- a/usr.bin/vi/common/Makefile
+++ b/usr.bin/vi/common/Makefile
@@ -10,8 +10,8 @@ LINKS+= ${BINDIR}/${VI} ${BINDIR}/view
MAN1= ${.CURDIR}/../USD.doc/vi.man/vi.1
CFLAGS+=-I. -I${.CURDIR}
-DPADD+= ${LIBCURSES} ${LIBTERM} ${LIBUTIL}
-LDADD+= -lcurses -ltermlib -lutil
+DPADD+= ${LIBCURSES} ${LIBTERMCAP} ${LIBUTIL}
+LDADD+= -lcurses -ltermcap -lutil
.PATH: ${.CURDIR}/../common ${.CURDIR}/../ex ${.CURDIR}/../sex \
${.CURDIR}/../vi ${.CURDIR}/../svi ${.CURDIR}/../xaw
@@ -90,7 +90,7 @@ tags::
warn:: ${SRCS}
-(cd ${.CURDIR} && gcc -Wall -O4 -DDEBUG \
- -Iobj -I. ${.ALLSRC} -lcurses -ltermlib 2>&1 | \
+ -Iobj -I. ${.ALLSRC} -lcurses -ltermcap 2>&1 | \
sed -e "/warning: .*sccsid.*defined but not used/d" \
-e "/warning: suggest parentheses around/d" \
-e "/In function /d" \
OpenPOWER on IntegriCloud