Don't need to explicately link in with -ltermlib now that curses and termlib are merged

6 files changed, 9 insertions, 11 deletions

diff --git a/distrib/hp300/ramdisk/raminst.conf b/distrib/hp300/ramdisk/raminst.conf
index c2dc70e8300..4451f7c5cb2 100644
--- a/distrib/hp300/ramdisk/raminst.conf
+++ b/distrib/hp300/ramdisk/raminst.conf
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: raminst.conf,v 1.6 1997/12/02 02:29:50 deraadt Exp $
+#	$OpenBSD: raminst.conf,v 1.7 1998/08/14 15:30:21 millert Exp $
 #
 # raminst.conf - unified binary for the RAM disk
 #
@@ -27,4 +27,4 @@ ln reboot halt
 ln less more
 ln build vi
 
-libs -ledit -lutil -lcurses -lcompat -lpcap -ll -lm -ltermlib
+libs -ledit -lutil -lcurses -lcompat -lpcap -ll -lm
diff --git a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
index 7e783bdcebc..5ae40bd6566 100644
--- a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
+++ b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: instbin-nokrb.conf,v 1.10 1997/12/02 02:30:01 deraadt Exp $
+#	$OpenBSD: instbin-nokrb.conf,v 1.11 1998/08/14 15:30:24 millert Exp $
 #
 # instbin-nokrb.conf - unified binary for the inst/upgr floppies
 #
@@ -27,4 +27,4 @@ ln gzip gunzip
 ln grep egrep
 ln grep fgrep
 
-libs -lutil -lcurses -ll -lm -ltermlib
+libs -lutil -lcurses -ll -lm
diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf
index 76f899ecf7a..97ffa23ab9e 100644
--- a/distrib/i386/floppies/ramdisk/instbin.conf
+++ b/distrib/i386/floppies/ramdisk/instbin.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: instbin.conf,v 1.18 1997/12/02 02:30:02 deraadt Exp $
+#	$OpenBSD: instbin.conf,v 1.19 1998/08/14 15:30:23 millert Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
@@ -27,4 +27,4 @@ ln gzip gunzip
 ln grep egrep
 ln grep fgrep
 
-libs -lutil -lcurses -lkrb -ldes -ll -lm -ltermlib
+libs -lutil -lcurses -lkrb -ldes -ll -lm
diff --git a/distrib/miniroot/makeconf.awk b/distrib/miniroot/makeconf.awk
index d5a6ef15f95..f1b250584dc 100644
--- a/distrib/miniroot/makeconf.awk
+++ b/distrib/miniroot/makeconf.awk
@@ -1,4 +1,4 @@
-#	$OpenBSD: makeconf.awk,v 1.6 1997/05/15 00:11:13 deraadt Exp $
+#	$OpenBSD: makeconf.awk,v 1.7 1998/08/14 15:30:25 millert Exp $
 #	$NetBSD: makeconf.awk,v 1.3 1996/05/04 15:45:32 pk Exp $
 
 #
@@ -7,7 +7,7 @@
 
 BEGIN {
 	printf("#\n# This file is automatically generated by `makeconf'\n#\n\n");
-	printf("\nlibs -ledit -lutil -lcurses -ltermlib -ll -lm -lkvm -lz -lkrb -ldes\n");
+	printf("\nlibs -ledit -lutil -lcurses -ll -lm -lkvm -lz -lkrb -ldes\n");
 
 }
 
diff --git a/distrib/mvme68k/ramdisk/raminst.conf b/distrib/mvme68k/ramdisk/raminst.conf
index 08a037e09d1..79d3720f0f2 100644
--- a/distrib/mvme68k/ramdisk/raminst.conf
+++ b/distrib/mvme68k/ramdisk/raminst.conf
@@ -24,4 +24,4 @@ ln test [
 ln reboot halt
 ln grep egrep
 
-libs -lutil -lcurses -ll -lm -ltermlib
+libs -lutil -lcurses -ll -lm
diff --git a/distrib/pmax/simpleroot/list b/distrib/pmax/simpleroot/list
index 04b4fbc2427..817055f3946 100644
--- a/distrib/pmax/simpleroot/list
+++ b/distrib/pmax/simpleroot/list
@@ -32,8 +32,6 @@ usr/lib/libc.so.??.?
 usr/lib/libcurses.so.?.?
 usr/lib/libedit.so.?.?
 usr/lib/libm.so.?.?
-usr/lib/libtermcap.so.?.?
-usr/lib/libtermlib.so.?.?
 usr/lib/libutil.so.?.?
 usr/libexec/ld.so
 usr/mdec