Add libkern and link it in after libz

6 files changed, 40 insertions, 15 deletions

diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc
index 537d4862158..7eb3339aa4e 100644
--- a/sys/arch/i386/stand/Makefile.inc
+++ b/sys/arch/i386/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.36 2004/07/24 17:39:27 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.37 2005/07/30 14:32:46 millert Exp $
 
 CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
 CFLAGS+=	-fno-stack-protector
@@ -43,6 +43,11 @@ LIBSA=${SADIR}/libsa/libsa.a
 .else
 LIBSA=${SADIR}/libsa/${__objdir}/libsa.a
 .endif
+.if exists(${SADIR}/libkern/libkern.a)
+LIBKERN=${SADIR}/libkern/libkern.a
+.else
+LIBKERN=${SADIR}/libkern/${__objdir}/libkern.a
+.endif
 .if exists(${SADIR}/libz/libz.a)
 LIBZ=${SADIR}/libz/libz.a
 .else
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index b1a561acf2c..bc4ea18edfd 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.31 2003/04/17 12:06:05 mickey Exp $
+#	$OpenBSD: Makefile,v 1.32 2005/07/30 14:32:46 millert Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -24,8 +24,8 @@ SRCS+=	boot.c cmd.c vars.c bootarg.c conf.c
 S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
-LDADD=	${LIBSA} ${LIBZ}
-DPADD=	${LIBSA} ${LIBZ}
+LDADD=	${LIBSA} ${LIBZ} ${LIBKERN}
+DPADD=	${LIBSA} ${LIBZ} ${LIBKERN}
 
 .PATH:	${S}/stand/boot
 
diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile
index ce25eb9e379..108f6dcf13c 100644
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2004/08/24 15:28:41 tom Exp $
+#	$OpenBSD: Makefile,v 1.4 2005/07/30 14:32:46 millert Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -19,8 +19,8 @@ SRCS+=	cdboot.c cmd.c vars.c bootarg.c conf.c
 S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
-LDADD=	${LIBSA} ${LIBZ}
-DPADD=	${LIBSA} ${LIBZ}
+LDADD=	${LIBSA} ${LIBZ} ${LIBKERN}
+DPADD=	${LIBSA} ${LIBZ} ${LIBKERN}
 
 .PATH:	${S}/stand/boot
 
diff --git a/sys/arch/i386/stand/libkern/Makefile b/sys/arch/i386/stand/libkern/Makefile
new file mode 100644
index 00000000000..b27a7b102a6
--- /dev/null
+++ b/sys/arch/i386/stand/libkern/Makefile
@@ -0,0 +1,22 @@
+#	$OpenBSD: Makefile,v 1.1 2005/07/30 14:32:46 millert Exp $
+
+.include "${.CURDIR}/../Makefile.inc"
+
+LIB=	kern
+
+S=${.CURDIR}/../../../..
+SADIR=${.CURDIR}/..
+
+.PATH:	${S}/lib/libkern
+
+NOPROFILE=noprofile
+NOPIC=nopic
+
+# kern routines
+SRCS+=	moddi3.c qdivrem.c strlcpy.c strlcat.c
+
+all: ${KERNLIB}
+
+install:
+
+.include <bsd.lib.mk>
diff --git a/sys/arch/i386/stand/libsa/Makefile b/sys/arch/i386/stand/libsa/Makefile
index 3cae2277f8d..9578d20fd19 100644
--- a/sys/arch/i386/stand/libsa/Makefile
+++ b/sys/arch/i386/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.44 2004/06/26 05:19:37 tom Exp $
+#	$OpenBSD: Makefile,v 1.45 2005/07/30 14:32:46 millert Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -6,8 +6,6 @@ LIB=	sa
 
 S=${.CURDIR}/../../../..
 SADIR=${.CURDIR}/..
-DIR_SA=	$S/lib/libsa
-DIR_KERN=$S/lib/libkern
 
 # 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
@@ -29,7 +27,7 @@ CLEANFILES+=	unixdev.o unixsys.o nullfs.o
 # 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 ctime.c strlcpy.c strlcat.c
+	strerror.c strncpy.c strtol.c ctime.c
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \
@@ -50,7 +48,7 @@ SRCS+=	debug.c
 NOPROFILE=noprofile
 NOPIC=nopic
 
-.PATH:  ${DIR_SA} ${DIR_KERN}
+.PATH:  $S/lib/libsa
 
 all: ${SALIB}
 
diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile
index 464273724fb..fce837db82b 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2004/03/19 13:48:19 tom Exp $
+#	$OpenBSD: Makefile,v 1.2 2005/07/30 14:32:46 millert Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -19,8 +19,8 @@ SRCS+=	boot.c cmd.c vars.c bootarg.c conf.c devopen.c net.c open.c
 S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
-LDADD=	${LIBSA} ${LIBZ}
-DPADD=	${LIBSA} ${LIBZ}
+LDADD=	${LIBSA} ${LIBZ} ${LIBKERN}
+DPADD=	${LIBSA} ${LIBZ} ${LIBKERN}
 
 .PATH:	${S}/stand/boot