From 316d268ee39e01f3142870210fbd987b6ff2c560 Mon Sep 17 00:00:00 2001
From: Jason Downs <downsj@cvs.openbsd.org>
Date: Fri, 17 Jan 1997 08:33:08 +0000
Subject: hp300 bootblocks, sync'd with NetBSD 011697, with changes and a new
 build method.

---
 sys/arch/hp300/stand/libsa/Makefile     | 14 ++++++++------
 sys/arch/hp300/stand/libsa/Makefile.inc |  5 +++--
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'sys/arch/hp300/stand/libsa')

diff --git a/sys/arch/hp300/stand/libsa/Makefile b/sys/arch/hp300/stand/libsa/Makefile
index 8ba5d23934c..848198d2efa 100644
--- a/sys/arch/hp300/stand/libsa/Makefile
+++ b/sys/arch/hp300/stand/libsa/Makefile
@@ -1,18 +1,21 @@
-#	$NetBSD: Makefile,v 1.4 1996/01/30 19:47:32 thorpej Exp $
+#	$OpenBSD: Makefile,v 1.3 1997/01/17 08:33:06 downsj Exp $
+#	$NetBSD: Makefile,v 1.5 1996/06/26 17:44:42 thorpej Exp $
 
 LIB=	sa
 
 .PATH:	${.CURDIR}/../../../../lib/libsa
+.PATH:	${.CURDIR}/..
 
 # Don't need these now...
 # DEBUGFLAGS=-DNETIF_DEBUG -DRPC_DEBUG -DNFS_DEBUG -DRARP_DEBUG -DNET_DEBUG
 
-CFLAGS+=-DSTANDALONE -DCOMPAT_UFS ${DEBUGFLAGS}
+CFLAGS+=-DSTANDALONE -DCOMPAT_UFS -DNO_LSEEK ${DEBUGFLAGS}
+CFLAGS+=-I${.CURDIR}/..
 CFLAGS+=-I${.CURDIR}/../../../..  -I${.CURDIR}/../../../../lib/libsa
 
 # stand routines
-SRCS=	alloc.c bcopy.c exit.c exec.c getfile.c gets.c globals.c \
-	memcpy.c printf.c strerror.c
+SRCS=	alloc.c exit.c exec.c getfile.c gets.c globals.c \
+	memcmp.c memcpy.c memset.c printf.c strerror.c
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \
@@ -25,11 +28,10 @@ SRCS+=	arp.c ether.c in_cksum.c net.c netif.c rpc.c
 SRCS+=	bootp.c bootparam.c rarp.c
 
 # boot filesystems
-SRCS+=	ufs.c nfs.c
+SRCS+=	ufs.c nfs.c rawfs.o
 
 NOPROFILE=
 NOPIC=
-OBJMACHINE=
 
 install:
 
diff --git a/sys/arch/hp300/stand/libsa/Makefile.inc b/sys/arch/hp300/stand/libsa/Makefile.inc
index 868438109ff..5100e4ad20c 100644
--- a/sys/arch/hp300/stand/libsa/Makefile.inc
+++ b/sys/arch/hp300/stand/libsa/Makefile.inc
@@ -1,11 +1,12 @@
+#	$OpenBSD: Makefile.inc,v 1.2 1997/01/17 08:33:07 downsj Exp $
 #	$NetBSD: Makefile.inc,v 1.1 1995/08/04 07:55:50 thorpej Exp $
 
 #	NOTE: $S must correspond to the top of the 'sys' tree
 
 SA_DIR=	$S/arch/hp300/stand/libsa
 
-.if exists($(SA_DIR)/obj.${MACHINE})
-SA_LIBDIR=	$(SA_DIR)/obj.${MACHINE}
+.if exists($(SA_DIR)/${__objdir})
+SA_LIBDIR=	$(SA_DIR)/${__objdir}
 .else
 SA_LIBDIR=	$(SA_DIR)
 .endif
-- 
cgit v1.2.3