Reorg to look more like sys/lib/libsa/Makefile

Reduce dependency on libkern.
Add libz.
Support passing thru CFLAGS from other Makefiles.

2 files changed, 16 insertions, 14 deletions

diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index 0b0643b3ef9..270b4e308ab 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 1997/02/20 21:05:38 gvf Exp $
+#	$OpenBSD: Makefile,v 1.13 1997/04/22 16:07:57 gvf Exp $
 
 LIB=sa
 
@@ -12,29 +12,31 @@ S=${.CURDIR}/../../../..
 DIR_SA=$S/lib/libsa
 DIR_KERN=$S/lib/libkern
 
-SRC_net= nfs.c rpc.c net.c ether.c arp.c in_cksum.c netif.c \
-	 bootparam.c rarp.c
+SRC_net= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
+	 rarp.c bootparam.c 
 
+SRC_sa=	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 \
+	close.c closeall.c dev.c dkcksum.c \
+	lseek.c open.c nullfs.c read.c fstat.c \
+	ufs.c cread.c
 
-SRC_sa = alloc.c memset.c memcpy.c close.c exit.c getfile.c gets.c open.c \
-	 printf.c read.c strerror.c ufs.c globals.c lseek.c \
-	 closeall.c dev.c dkcksum.c nullfs.c fstat.c memcmp.c
-
-SRC_kern= ashrdi3.c bcmp.c bzero.c strcmp.c strncpy.c strlen.c
+SRC_kern= ashrdi3.c
 
 SRC_mvme= exec_mvme.c
 
-SRC_here= clock.c bugdev.c parse_args.c
+SRC_here= bugdev.c clock.c parse_args.c
 
-SRCS= ${SRC_net} ${SRC_sa} ${SRC_kern} ${SRC_mvme} ${SRC_here}
+SRCS= ${SRC_net} ${SRC_sa} ${SRC_mvme} ${SRC_here} ${SRC_kern}
 
 # DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
 # 	-DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
 
 #DEFS= -DCOMPAT_UFS
-INCL= -I. -I${.CURDIR}/../libbug -I${S}/lib/libsa -I${S}
+DEFS= -D__INTERNAL_LIBSA_CREAD
+INCL= -I${.CURDIR} -I${.CURDIR}/../libbug -I${S}/lib/libsa -I${S}
 COPTS= #-fno-defer-pop
-CFLAGS= -O2 ${COPTS} ${DEFS} ${DBG} ${INCL}
+CFLAGS+= ${XCFLAGS} -O2 ${COPTS} ${DEFS} ${DBG} ${INCL}
 
 .PATH:  ${DIR_SA} ${DIR_KERN} 
 
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile.inc b/sys/arch/mvme68k/stand/libsa/Makefile.inc
index 31a21177236..f59d82643ea 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile.inc
+++ b/sys/arch/mvme68k/stand/libsa/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1996/05/16 02:30:38 chuck Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 1997/04/22 16:07:57 gvf Exp $
 
 LIB_SA_DIR=${S}/arch/${MACHINE}/stand/libsa
 
@@ -10,6 +10,6 @@ SRTOBJ?= ${LIBSA_DIR}/SRT0.o
 
 $(LIBSA):	.NOTMAIN __always_make_libsa
 	@echo making sure the libsa is up to date...
-	@(cd ${LIB_SA_DIR}; ${MAKE})
+	@(cd ${LIB_SA_DIR}; ${MAKE} "XCFLAGS=${CFLAGS}")
 
 __always_make_libsa:	.NOTMAIN