Always use -ltermlib when linking with -lcurses

Depend on LIBTERMCAP and LIBTERMLIB as appropriate

15 files changed, 20 insertions, 20 deletions

diff --git a/games/atc/Makefile b/games/atc/Makefile
index 8bf902a6abb..8c672516e03 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -6,8 +6,8 @@ CFLAGS+=-DBSD -I${.CURDIR} -I.
 SRCS=	extern.c grammar.c graphics.c input.c lex.c list.c log.c \
 	main.c tunable.c update.c
 MAN=	atc.6
-LDADD=	-ll -lm -lcurses -ltermcap
-DPADD=	${LIBL} ${LIBM} ${LIBTERM} ${LIBCURSES}
+LDADD=	-ll -lm -lcurses -ltermlib
+DPADD=	${LIBL} ${LIBM} ${LIBTERMLIB} ${LIBCURSES}
 GAMES=	ATC_scores Game_List Killer crossover default easy game_2 \
 	Atlantis OHare Tic-Tac-Toe airports box crosshatch game_3 \
 	game_4 novice two-corners
diff --git a/games/battlestar/Makefile b/games/battlestar/Makefile
index f187de46f62..e0ca3f01722 100644
--- a/games/battlestar/Makefile
+++ b/games/battlestar/Makefile
@@ -6,7 +6,7 @@ SRCS=	battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \
 	init.c cypher.c getcom.c parse.c room.c save.c fly.c misc.c \
 	globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
 MAN=	battlestar.6
-DPADD=	${LIBCURSES} ${LIBTERMCAP}
+DPADD=	${LIBCURSES} ${LIBTERMLIB}
 LDADD=	-lcurses -ltermlib
 HIDEGAME=hidegame
 
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index 69c60d774c2..47f48a88a11 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -2,7 +2,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	cribbage
-DPADD=	${LIBCURSES} ${LIBTERM}
+DPADD=	${LIBCURSES} ${LIBTERMLIB}
 LDADD=	-lcurses -ltermlib
 SRCS=	extern.c crib.c cards.c instr.c io.c score.c support.c
 MAN=	cribbage.6
diff --git a/games/hack/Makefile b/games/hack/Makefile
index aeeaae420b3..eec49a21027 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/03/09 01:33:28 niklas Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/06/02 05:44:16 tholo Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	hack
@@ -16,7 +16,7 @@ SRCS+=	alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
 	hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
 	hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c
 MAN=	hack.6
-DPADD+=	${LIBTERM} ${LIBCOMPAT}
+DPADD+=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD+=	-ltermcap -lcompat
 HIDEGAME=hidegame
 CLEANFILES+=hack.onames.h makedefs
diff --git a/games/hangman/Makefile b/games/hangman/Makefile
index 1c965e9281c..d948005f780 100644
--- a/games/hangman/Makefile
+++ b/games/hangman/Makefile
@@ -5,7 +5,7 @@ PROG=	hangman
 SRCS=	endgame.c extern.c getguess.c getword.c main.c playgame.c \
 	prdata.c prman.c prword.c setup.c
 MAN=	hangman.6
-DPADD=	${LIBCURSES} ${LIBTERM}
+DPADD=	${LIBCURSES} ${LIBTERMLIB}
 LDADD=	-lcurses -ltermlib
 HIDEGAME=hidegame
 
diff --git a/games/larn/Makefile b/games/larn/Makefile
index 987d0159b5c..102edbd68d3 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -58,7 +58,7 @@ CFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE
 SRCS=	main.c object.c create.c tok.c display.c global.c data.c io.c \
 	monster.c store.c diag.c help.c config.c nap.c bill.c scores.c \
 	signal.c moreobj.c movem.c regen.c fortune.c savelev.c
-DPADD=	${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 HIDEGAME=hidegame
 
diff --git a/games/mille/Makefile b/games/mille/Makefile
index db585de3e8a..ed0e3cb3802 100644
--- a/games/mille/Makefile
+++ b/games/mille/Makefile
@@ -4,7 +4,7 @@
 PROG=	mille
 SRCS=	comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
 	roll.c save.c types.c varpush.c
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBCURSES} ${LIBTERMLIB} ${LIBCOMPAT}
 LDADD=	-lcurses -ltermlib -lcompat
 MAN=	mille.6
 HIDEGAME=hidegame
diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile
index b7a0b082f56..347566aa49c 100644
--- a/games/phantasia/Makefile
+++ b/games/phantasia/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 1996/03/09 09:16:46 niklas Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/06/02 05:44:18 tholo Exp $
 #	$NetBSD: Makefile,v 1.4 1995/03/24 03:58:22 cgd Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	phantasia
 SRCS=	main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c
-DPADD=	${LIBM} ${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBM} ${LIBCURSES} ${LIBTERMLIB} ${LIBCOMPAT}
 LDADD=	-lm -lcurses -ltermlib -lcompat
 HIDEGAME=hidegame
 MAN=	phantasia.6
diff --git a/games/rain/Makefile b/games/rain/Makefile
index 8cbbac537ec..de48e78810c 100644
--- a/games/rain/Makefile
+++ b/games/rain/Makefile
@@ -3,7 +3,7 @@
 
 PROG=	rain
 MAN=	rain.6
-DPADD=	${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 
 .include <bsd.prog.mk>
diff --git a/games/robots/Makefile b/games/robots/Makefile
index 25764c9395d..0885bd68194 100644
--- a/games/robots/Makefile
+++ b/games/robots/Makefile
@@ -6,7 +6,7 @@ CFLAGS+=-DMAX_PER_UID=5
 SRCS=	extern.c init_field.c main.c make_level.c move.c move_robs.c \
 	play_level.c query.c rnd_pos.c score.c flush_in.c
 MAN=	robots.6
-DPADD=	${LIBCURSES} ${LIBTERM}
+DPADD=	${LIBCURSES} ${LIBTERMLIB}
 LDADD=	-lcurses -ltermlib
 HIDEGAME=hidegame
 
diff --git a/games/rogue/Makefile b/games/rogue/Makefile
index 2a97418e04c..81f4ab32233 100644
--- a/games/rogue/Makefile
+++ b/games/rogue/Makefile
@@ -6,7 +6,7 @@ CFLAGS+=-DUNIX -fwritable-strings
 SRCS=	curses.c hit.c init.c inventory.c level.c machdep.c main.c \
 	message.c monster.c move.c object.c pack.c play.c random.c ring.c \
 	room.c save.c score.c spec_hit.c throw.c trap.c use.c zap.c
-DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBCURSES} ${LIBTERMLIB} ${LIBCOMPAT}
 LDADD=	-lcurses -ltermlib -lcompat
 HIDEGAME=hidegame
 MAN=	rogue.6
diff --git a/games/sail/Makefile b/games/sail/Makefile
index 025a1003d43..e4e10032f72 100644
--- a/games/sail/Makefile
+++ b/games/sail/Makefile
@@ -6,7 +6,7 @@ SRCS=	main.c pl_main.c pl_1.c pl_2.c pl_3.c pl_4.c pl_5.c pl_6.c pl_7.c \
 	dr_main.c dr_1.c dr_2.c dr_3.c dr_4.c dr_5.c lo_main.c \
 	assorted.c game.c globals.c misc.c parties.c sync.c version.c
 MAN=	sail.6
-DPADD=	${LIBCURSES} ${LIBTERM}
+DPADD=	${LIBCURSES} ${LIBTERMLIB}
 LDADD=	-lcurses -ltermlib
 HIDEGAME=hidegame
 
diff --git a/games/tetris/Makefile b/games/tetris/Makefile
index c49b261ce7a..208780b56e6 100644
--- a/games/tetris/Makefile
+++ b/games/tetris/Makefile
@@ -4,7 +4,7 @@
 PROG=	tetris
 SRCS=	input.c screen.c shapes.c scores.c tetris.c
 MAN=	tetris.6
-DPADD=	${LIBTERM}
+DPADD=	${LIBTERMCAP}
 LDADD=	-ltermcap
 HIDEGAME=hidegame
 
diff --git a/games/worm/Makefile b/games/worm/Makefile
index c79fc0d2fa7..1646214c326 100644
--- a/games/worm/Makefile
+++ b/games/worm/Makefile
@@ -3,8 +3,8 @@
 
 PROG=	worm
 MAN=	worm.6
-DPADD=	${LIBCURSES} ${LIBTERM}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES} ${LIBTERMLIB}
+LDADD=	-lcurses -ltermlib
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff --git a/games/worms/Makefile b/games/worms/Makefile
index ea9c3bf2f39..c6963fb7f62 100644
--- a/games/worms/Makefile
+++ b/games/worms/Makefile
@@ -3,7 +3,7 @@
 
 PROG=	worms
 MAN=	worms.6
-DPADD=	${LIBCURSES} ${LIBTERM}
-LDADD=	-lcurses -ltermcap
+DPADD=	${LIBCURSES} ${LIBTERMLIB}
+LDADD=	-lcurses -ltermlib
 
 .include <bsd.prog.mk>