Set SHLIB_{MAJOR,MINOR} explicitly instead of using shlib_version files.

(This currently means that checkver doesn't work with these libs, but that
will be fixed.)

gnu/lib/libbfd/Makefile

@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.22 2001/08/19 14:19:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.23 2001/09/21 15:38:15 tv Exp $
 
 LIB=		bfd
 
+MKLINKLIB=	no
 MKLINT=		no
 MKMAN=		no
 MKPROFILE=	no
@@ -12,7 +13,8 @@ MKPROFILE=	no
 
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
 
-MKLINKLIB=	no
+SHLIB_MAJOR=	4
+SHLIB_MINOR=	0
 
 TOP=		${.CURDIR}/../..
 DIST=		${TOP}/dist/toolchain
@@ -43,11 +45,9 @@ targets.o targets.so: targmatch.h Makefile
 #
 # XXX - BEGIN - Old toolchain build goop - delete when everything migrated - XXX
 #
-MKPIC=		no	# XXX shlib version mismatch
 
-.if ${MKPIC} != "no"
-MKLINKLIB=	no
-.endif
+SHLIB_MAJOR=	3
+SHLIB_MINOR=	0
 
 .if (${OBJECT_FMT} == "ELF") || defined(BOOTSTRAP_ELF)
 ELF_PLEASE=

gnu/lib/libbfd/shlib_version

@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.3 2001/09/10 11:18:41 simonb Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=4
-minor=0

gnu/lib/libg2c/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2001/07/24 19:44:48 tv Exp $
+#	$NetBSD: Makefile,v 1.11 2001/09/21 15:38:15 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -9,6 +9,9 @@ MKLINT=		no
 
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
 
+SHLIB_MAJOR=	1
+SHLIB_MINOR=	0
+
 TOP=		${.CURDIR}/../..
 DIST=		${TOP}/dist/toolchain
 
@@ -52,7 +55,9 @@ ${OBJS}: ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
 #
 # XXX - BEGIN - Old toolchain build goop - delete when everything migrated - XXX
 #
-MKPIC=no	# XXX hack; shlib_version mismatch
+
+SHLIB_MAJOR=	0
+SHLIB_MINOR=	0
 
 F77SRCS=	F77_aloc.c Version.c main.c s_rnge.c abort_.c getarg_.c \
 		iargc_.c getenv_.c signal_.c s_stop.c s_paus.c system_.c \

gnu/lib/libg2c/shlib_version

@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.4 2001/09/10 11:18:41 simonb Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=1
-minor=0

gnu/lib/libobjc/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2001/07/24 19:44:49 tv Exp $
+#	$NetBSD: Makefile,v 1.13 2001/09/21 15:38:16 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,9 @@ MKLINT=		no
 
 .if defined(USE_NEW_TOOLCHAIN)
 
+SHLIB_MAJOR=	1
+SHLIB_MINOR=	0
+
 # Machine-independent definitions (include file names).
 .include "${.CURDIR}/defs.mk"
 
@@ -45,7 +48,8 @@ HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
 .if (${HAVE_GCC28} != "")
 
-MKPIC=no	# XXX hack; shlib_version mismatch
+SHLIB_MAJOR=	0
+SHLIB_MINOR=	0
 
 SRCS=		hash.c sarray.c class.c sendmsg.c init.c archive.c \
 		encoding.c selector.c objects.c misc.c NXConstStr.m \

gnu/lib/libobjc/shlib_version

@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.4 2001/09/10 11:18:42 simonb Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=1
-minor=0

gnu/lib/libstdc++/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2001/08/19 14:19:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2001/09/21 15:38:16 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -9,6 +9,9 @@ MKLINT=		no
 
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
 
+SHLIB_MAJOR=	4
+SHLIB_MINOR=	0
+
 SUBDIR=		include io config
 
 TOP=		${.CURDIR}/../..
@@ -77,7 +80,9 @@ ${OBJS}: ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
 #
 # XXX - BEGIN - Old toolchain build goop - delete when everything migrated - XXX
 #
-MKPIC=no	# XXX hack; shlib_version mismatch
+
+SHLIB_MAJOR=	2
+SHLIB_MINOR=	0
 
 INCS=		cassert cctype cerrno cfloat ciso646 climits clocale cmath \
 		complex csetjmp csignal cstdarg cstddef cstdio cstdlib \

gnu/lib/libstdc++/shlib_version

@@ -1,5 +0,0 @@
-#	$NetBSD: shlib_version,v 1.6 2001/09/10 11:18:42 simonb Exp $
-#	Remember to update distrib/sets/lists/base/shl.* when changing
-#
-major=4
-minor=0