rearrange build structure so different architecture-specific libraries

can have separate shared library versions, by building in the arch
subdirectory.

lib/libarch/Makefile

@@ -1,33 +1,7 @@
-#	$Id: Makefile,v 1.7 1994/07/02 22:32:15 cgd Exp $
+#	$NetBSD: Makefile,v 1.8 1996/02/21 02:43:52 jtk Exp $
 
-.if exists(${.CURDIR}/${MACHINE})
-.PATH:	${.CURDIR}/${MACHINE}
-.include "${.CURDIR}/${MACHINE}/Makefile.inc"
-AINC+= -I${.CURDIR}/${MACHINE}
+.if exists(${MACHINE})
+SUBDIR+= ${MACHINE}
 .endif
 
-.if exists(${.CURDIR}/${MACHINE_ARCH}) && (${MACHINE} != ${MACHINE_ARCH})
-.PATH:	${.CURDIR}/${MACHINE_ARCH}
-.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
-AINC+= -I${.CURDIR}/${MACHINE_ARCH}
-.endif
-
-OBJS+= ${ASM}
-POBJS+=	${ASM:.o=.po}
-CLEANFILES+= ${ASM} ${POBJS}
-
-
-.if exists(${.CURDIR}/${MACHINE}) || exists(${.CURDIR}/${MACHINE_ARCH})
-# then there's a lib for this machine/machine architecture
-LIB=	${MACHINE}
-.include <bsd.lib.mk>
-.else
-# there's NOT, so get the targets right
-all:
-clean:
-cleandir:
-depend:
-install:
-lint:
-obj:
-.endif
+.include <bsd.subdir.mk>

lib/libarch/Makefile.inc

@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile.inc,v 1.1 1996/02/21 02:43:57 jtk Exp $
+#
+# This Makefile includes boiler-plate stuff included by each subdir's Makefile.
+
+.if exists(${.CURDIR}/../${MACHINE_ARCH}) && (${MACHINE} != ${MACHINE_ARCH})
+.PATH:	${.CURDIR}/../${MACHINE_ARCH}
+.include "${.CURDIR}/../${MACHINE_ARCH}/Makefile.inc"
+AINC+= -I${.CURDIR}/../${MACHINE_ARCH}
+.endif
+
+OBJS+= ${ASM}
+POBJS+=	${ASM:.o=.po}
+CLEANFILES+= ${ASM} ${POBJS}
+
+LIB=    ${MACHINE}

lib/libarch/alpha/Makefile

@@ -1,5 +1,7 @@
-#	Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
+#	$NetBSD: Makefile,v 1.1 1996/02/21 02:45:40 jtk Exp $
 
 #.PATH: ${LIBC}/i386
 
 SRCS+=	alpha_mmclock_gettime.c alpha_mmclock_init.c gettimeofday.c
+
+.include <bsd.lib.mk>

lib/libarch/i386/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.5 1996/02/21 00:21:45 jtk Exp $
+#	$NetBSD: Makefile,v 1.1 1996/02/21 02:45:47 jtk Exp $
 
 .PATH: ${LIBC}/i386
 
@@ -12,3 +12,6 @@ MAN+=	i386_get_ldt.2 \
 
 MLINKS+=i386_get_ldt.2 i386_set_ldt.2 \
 	i386_get_ioperm.2 i386_set_ioperm.2
+
+.include <bsd.lib.mk>
+

lib/libarch/i386/shlib_version

@@ -1,2 +1,2 @@
 major=0
-minor=1
+minor=2