Repair fallout from libkern changes.

3 files changed, 17 insertions, 39 deletions

diff --git a/sys/arch/hp300/stand/libsa/Makefile b/sys/arch/hp300/stand/libsa/Makefile
index 7e0eea84d36..1ad0f89858b 100644
--- a/sys/arch/hp300/stand/libsa/Makefile
+++ b/sys/arch/hp300/stand/libsa/Makefile
@@ -1,9 +1,7 @@
-#	$OpenBSD: Makefile,v 1.14 2006/08/17 06:31:10 miod Exp $
+#	$OpenBSD: Makefile,v 1.15 2007/12/28 18:56:08 miod Exp $
 
 LIB=	sa
 
-.PATH:	${.CURDIR}/../../../../lib/libsa
-
 .include "${.CURDIR}/../Makefile.inc"
 
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include -I${.CURDIR}/../.. \
@@ -11,8 +9,13 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include -I${.CURDIR}/../.. \
 	-I${.CURDIR}/../../../../lib/libsa
 
 # stand routines
-SRCS=	alloc.c devopen.c exit.c exec.c getfile.c gets.c globals.c \
-	memcmp.c memcpy.c memset.c printf.c snprintf.c strerror.c strncpy.c
+.PATH:	${.CURDIR}/../../../../lib/libsa
+SRCS+=	alloc.c devopen.c exit.c exec.c getfile.c gets.c globals.c \
+	memcmp.c memcpy.c memset.c printf.c snprintf.c strcmp.c \
+	strerror.c strlen.c strncmp.c strncpy.c
+
+.PATH:	${.CURDIR}/../../../../lib/libkern
+SRCS+=	__main.c
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \
diff --git a/sys/arch/hp300/stand/libsaz/Makefile b/sys/arch/hp300/stand/libsaz/Makefile
index 43d5e09e414..27e1a1779dc 100644
--- a/sys/arch/hp300/stand/libsaz/Makefile
+++ b/sys/arch/hp300/stand/libsaz/Makefile
@@ -1,36 +1,11 @@
-#	$OpenBSD: Makefile,v 1.3 2006/08/17 06:31:10 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2007/12/28 18:56:09 miod Exp $
 
-LIB=	saz
-
-.PATH:	${.CURDIR}/../../../../lib/libsa ${.CURDIR}/../libsa
-
-.include "${.CURDIR}/../Makefile.inc"
-
-CFLAGS+=-D__INTERNAL_LIBSA_CREAD \
-	-I${.CURDIR} -I${.CURDIR}/../include -I${.CURDIR}/../.. \
-	-I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. \
-	-I${.CURDIR}/../../../../lib/libsa
-
-# stand routines
-SRCS=	alloc.c devopen.c exit.c exec.c getfile.c gets.c globals.c \
-	memcmp.c memcpy.c memset.c printf.c snprintf.c strerror.c strncpy.c
+CFLAGS+=-D__INTERNAL_LIBSA_CREAD
 
 # io routines
-SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \
-	open.c read.c stat.c write.c cread.c
+SRCS+=	cread.c
 
-# network routines
-SRCS+=	arp.c ether.c in_cksum.c net.c netif.c rpc.c
+.include "${.CURDIR}/../libsa/Makefile"
+.PATH:	${.CURDIR}/../libsa
 
-# network info services
-SRCS+=	bootp.c bootparam.c rarp.c
-
-# boot filesystems
-SRCS+=	ufs.c nfs.c rawfs.c cd9660.c
-
-NOPROFILE=
-NOPIC=
-
-install:
-
-.include <bsd.lib.mk>
+LIB=	saz
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index 2f31af438d0..31750f45dee 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2007/11/26 10:26:02 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.20 2007/12/28 18:56:09 miod Exp $
 
 LIB=sa
 
@@ -13,13 +13,13 @@ S=${.CURDIR}/../../../..
 SRCS+=	bugdev.c clock.c parse_args.c exec_mvme.c
 
 .PATH:  $S/lib/libsa
-SRCs+=	alloc.c memcpy.c exit.c getfile.c gets.c globals.c printf.c \
+SRCS+=	alloc.c memcpy.c exit.c getfile.c gets.c globals.c printf.c \
 	strerror.c memset.c memcmp.c strncpy.c strcmp.c strlen.c \
 	snprintf.c close.c closeall.c dev.c dkcksum.c lseek.c open.c \
 	nullfs.c read.c fstat.c ufs.c cread.c
 SRCS+=	arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c rarp.c bootparam.c
 
-.PATH:	${S}/lib/libkern/arch/m68k ${S}/lib/libkern
+.PATH:	${S}/lib/libkern
 SRCS+=	ashrdi3.c
 
 # DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \