Remove the now unused i386 libsa/libz Makefiles.

ok deraadt@

4 files changed, 3 insertions, 89 deletions

diff --git a/sys/arch/i386/stand/Makefile b/sys/arch/i386/stand/Makefile
index b37b931ae9f..52d1a3c5f56 100644
--- a/sys/arch/i386/stand/Makefile
+++ b/sys/arch/i386/stand/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.17 2012/10/12 14:00:02 jsing Exp $
+#	$OpenBSD: Makefile,v 1.18 2012/10/30 11:08:27 jsing Exp $
 
 .if ${MACHINE} == "i386"
-SUBDIR=	etc libsa libz mbr cdbr
+SUBDIR=	etc mbr cdbr
 .endif
 SUBDIR+= biosboot boot cdboot fdboot installboot pxeboot
 
diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc
index 474c4d2ab5c..6de02ca088f 100644
--- a/sys/arch/i386/stand/Makefile.inc
+++ b/sys/arch/i386/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.42 2012/08/29 22:23:07 pascal Exp $
+#	$OpenBSD: Makefile.inc,v 1.43 2012/10/30 11:08:27 jsing Exp $
 
 CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
 CFLAGS+=	-fno-stack-protector
@@ -32,22 +32,11 @@ SACFLAGS+=-nostdinc -fno-builtin -fpack-struct
 	@([ X$(S) = X -o -h machine ] || ln -s $(S)/arch/i386/include machine)
 .endif
 
-
 .if exists(${SADIR}/etc/assym.h)
 CPPFLAGS+=-I${SADIR}/etc
 .else
 CPPFLAGS+=-I${SADIR}/etc/${__objdir}
 .endif
-.if exists(${SADIR}/libsa/libsa.a)
-LIBSA=${SADIR}/libsa/libsa.a
-.else
-LIBSA=${SADIR}/libsa/${__objdir}/libsa.a
-.endif
-.if exists(${SADIR}/libz/libz.a)
-LIBZ=${SADIR}/libz/libz.a
-.else
-LIBZ=${SADIR}/libz/${__objdir}/libz.a
-.endif
 
 # NO_NET=no_net
 BINDIR=	/usr/mdec
diff --git a/sys/arch/i386/stand/libsa/Makefile b/sys/arch/i386/stand/libsa/Makefile
index 0b8305ba8e7..e69de29bb2d 100644
--- a/sys/arch/i386/stand/libsa/Makefile
+++ b/sys/arch/i386/stand/libsa/Makefile
@@ -1,64 +0,0 @@
-#	$OpenBSD: Makefile,v 1.49 2012/08/29 22:23:08 pascal Exp $
-
-.include "${.CURDIR}/../Makefile.inc"
-
-LIB=	sa
-
-S=${.CURDIR}/../../../..
-SADIR=${.CURDIR}/..
-
-# i386 stuff (so, it will possibly load in the same 64k)
-SRCS+=	machdep.c dev_i386.c exec_i386.c cmd_i386.c loadfile.c elf32.c elf64.c
-
-.if defined(DEBUGFLAGS) && !empty(DEBUGFLAGS:M-D_TEST)
-SRCS+=	unixdev.c unixsys.S nullfs.c memprobe.c
-CLEANFILES+=	gidt.o debug_i386.o alloca.o \
-	biosdev.o bioscons.o gateA20.o apmprobe.o \
-	cpuprobe.o memprobe.o diskprobe.o smpprobe.o \
-	time.o biosprobe.o
-.else
-SRCS+=	gidt.S debug_i386.S alloca.S \
-	biosdev.c bioscons.c gateA20.c apmprobe.c \
-	cpuprobe.c memprobe.c diskprobe.c pciprobe.c smpprobe.c \
-	time.c biosprobe.c ps2probe.c pxe.c pxe_net.c pxe_call.S
-CLEANFILES+=	unixdev.o unixsys.o nullfs.o
-.endif
-
-# stand routines
-SRCS+=	alloc.c exit.c getfile.c gets.c globals.c strcmp.c strlen.c \
-	strncmp.c memcmp.c memcpy.c memset.c printf.c snprintf.c \
-	strerror.c strncpy.c strtol.c strtoll.c ctime.c
-
-# 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 readdir.c cons.c
-
-# network routines
-SRCS+=	arp.c ether.c in_cksum.c net.c netif.c rpc.c
-
-# network info services
-SRCS+=	bootp.c bootparam.c rarp.c
-
-# boot filesystems
-SRCS+=	ufs.c nfs.c tftp.c cd9660.c
-
-# debugger
-SRCS+=	debug.c
-
-NOPROFILE=noprofile
-NOPIC=nopic
-
-.PATH:  $S/lib/libsa
-
-all: ${SALIB}
-
-install:
-
-.include <bsd.lib.mk>
-
-CPPFLAGS+=-DLINKADDR=${LINKADDR} -DHEAP_LIMIT=${HEAP_LIMIT} ${DEBUGFLAGS}
-CPPFLAGS+=-I${S}/stand/boot #-DCOMPAT_UFS
-CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD -fno-pie
-#AS=cat ; 
-#AS+=	-R
-#AS+=	-a
diff --git a/sys/arch/i386/stand/libz/Makefile b/sys/arch/i386/stand/libz/Makefile
index c42ef1bf0ae..e69de29bb2d 100644
--- a/sys/arch/i386/stand/libz/Makefile
+++ b/sys/arch/i386/stand/libz/Makefile
@@ -1,11 +0,0 @@
-#	$OpenBSD: Makefile,v 1.14 2012/09/03 04:04:07 deraadt Exp $
-#	$NetBSD: Makefile,v 1.2 1997/01/22 01:36:30 cgd Exp $
-
-S=${.CURDIR}/../../../..
-ZDST=${.OBJDIR}
-SADIR=${.CURDIR}/..
-
-.PATH: ${S}/lib/libz
-
-.include "${S}/lib/libz/Makefile"
-CFLAGS+=${SACFLAGS} -I${S}/lib/libsa ${DEBUGFLAGS} -fno-pie