adjust to libkern changes (and pretty .PATH logic); parts from maja

4 files changed, 54 insertions, 28 deletions

diff --git a/sys/arch/hppa/stand/boot/Makefile b/sys/arch/hppa/stand/boot/Makefile
index bb85f69c16b..cc2075613b7 100644
--- a/sys/arch/hppa/stand/boot/Makefile
+++ b/sys/arch/hppa/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2006/10/30 18:28:57 jmc Exp $
+#	$OpenBSD: Makefile,v 1.20 2007/11/26 08:36:49 deraadt Exp $
 
 MAN=	boot.8
 MANSUBDIR=hppa
@@ -8,7 +8,15 @@ CLEANFILES+=	boot.gdb boot.map boot.lif
 
 .if ${MACHINE} == "hppa"
 PROG=	boot
-SRCS=	srt0.S exec.c boot.c cmd.c vars.c bootarg.c conf.c
+SRCS=	srt0.S exec.c conf.c
+
+.PATH:	${S}/stand/boot
+SRCS+=	bootarg.c boot.c vars.c cmd.c 
+
+.PATH:	${S}/lib/libkern/arch/hppa ${S}/lib/libkern
+SRCS+=	milli.S ashrdi3.c memcmp.c memcpy.c memset.c muldi3.c \
+	strcmp.c strlcpy.c strlen.c strncmp.c strncpy.c
+
 LD?=	ld
 LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR)
 LDFLAGS+=-T ${.CURDIR}/ld.script -Map boot.map
@@ -21,10 +29,8 @@ LINKS=	${BINDIR}/boot.lif ${BINDIR}/sdboot \
 	${BINDIR}/boot.lif ${BINDIR}/stboot \
 	${BINDIR}/boot.lif ${BINDIR}/xxboot
 
-LDADD=	${LIBSA} ${LIBZ} ${LIBKERN}
-DPADD=	${LIBSA} ${LIBZ} ${LIBKERN}
-
-.PATH:	${S}/stand/boot
+LDADD=	${LIBSA} ${LIBZ}
+DPADD=	${LIBSA} ${LIBZ}
 
 all:	boot.lif
 
diff --git a/sys/arch/hppa/stand/cdboot/Makefile b/sys/arch/hppa/stand/cdboot/Makefile
index 2cdf8619217..47a08cf0f62 100644
--- a/sys/arch/hppa/stand/cdboot/Makefile
+++ b/sys/arch/hppa/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2003/04/17 12:15:51 mickey Exp $
+#	$OpenBSD: Makefile,v 1.4 2007/11/26 08:36:49 deraadt Exp $
 
 NOMAN=	no man
 S	=${.CURDIR}/../../../..
@@ -7,7 +7,18 @@ CLEANFILES+=	cdboot.gdb cdboot.map
 .if ${MACHINE} == "hppa"
 
 PROG=	cdboot
-SRCS=	srt0.S cdboot.c pdc.c itecons.c dev_hppa.c dk.c
+
+.PATH:	${.CURDIR}/../boot
+SRCS+=	srt0.S
+
+SRCS=	srt0.S cdboot.c
+
+.PATH:	${.CURDIR}/../libsa
+SRCS+=	pdc.c itecons.c dev_hppa.c dk.c 
+
+.PATH:	${S}/lib/libkern/arch/hppa ${S}/lib/libkern
+SRCS+=	milli.S strlen.c strlcpy.c
+
 LD?=	ld
 LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR)
 LDFLAGS+=-T ${.CURDIR}/ld.script -Map cdboot.map
@@ -20,12 +31,8 @@ CRTEND=
 SAREL=
 USE_LOADFILE=yes
 .include "${S}/lib/libsa/Makefile.inc"
-DPADD+= $(SALIB) $(LIBKERN)
-LDADD+=	$(SALIB) $(LIBKERN)
-
-.PATH:	${S}/stand/boot
-.PATH:	${.CURDIR}/../boot
-.PATH:	${.CURDIR}/../libsa
+DPADD+= $(SALIB)
+LDADD+=	$(SALIB)
 
 all:	${PROG}
 
diff --git a/sys/arch/hppa64/stand/boot/Makefile b/sys/arch/hppa64/stand/boot/Makefile
index 219faed9945..1b5780440e9 100644
--- a/sys/arch/hppa64/stand/boot/Makefile
+++ b/sys/arch/hppa64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2006/10/30 18:28:57 jmc Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/11/26 08:36:49 deraadt Exp $
 
 MAN=	boot.8
 MANSUBDIR=hppa64
@@ -8,7 +8,15 @@ CLEANFILES+=	boot.gdb boot.map boot.lif
 
 .if ${MACHINE} == "hppa64"
 PROG=	boot
-SRCS=	srt0.S exec.c boot.c cmd.c vars.c bootarg.c conf.c
+SRCS=	srt0.S exec.c conf.c
+
+.PATH:	${S}/stand/boot
+SRCS+=	bootarg.c boot.c vars.c cmd.c 
+
+.PATH:	${S}/lib/libkern/arch/hppa ${S}/lib/libkern
+SRCS+=	milli.S ashrdi3.c memcmp.c memcpy.c memset.c muldi3.c \
+	strcmp.c strlcpy.c strlen.c strncmp.c strncpy.c
+
 LD?=	ld
 LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR)
 LDFLAGS+=-T ${.CURDIR}/ld.script -Map boot.map
@@ -22,10 +30,8 @@ LINKS=	${BINDIR}/boot.lif ${BINDIR}/sdboot \
 	${BINDIR}/boot.lif ${BINDIR}/stboot \
 	${BINDIR}/boot.lif ${BINDIR}/xxboot
 
-LDADD=	${LIBSA} ${LIBZ} ${LIBKERN}
-DPADD=	${LIBSA} ${LIBZ} ${LIBKERN}
-
-.PATH:	${S}/stand/boot
+LDADD=	${LIBSA} ${LIBZ}
+DPADD=	${LIBSA} ${LIBZ}
 
 all:	boot.lif
 
diff --git a/sys/arch/hppa64/stand/cdboot/Makefile b/sys/arch/hppa64/stand/cdboot/Makefile
index 6ff9c00821a..96f5792c252 100644
--- a/sys/arch/hppa64/stand/cdboot/Makefile
+++ b/sys/arch/hppa64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2005/04/01 10:40:48 mickey Exp $
+#	$OpenBSD: Makefile,v 1.2 2007/11/26 08:36:49 deraadt Exp $
 
 NOMAN=	no man
 S	=${.CURDIR}/../../../..
@@ -7,7 +7,18 @@ CLEANFILES+=	cdboot.gdb cdboot.map
 .if ${MACHINE} == "hppa64"
 
 PROG=	cdboot
-SRCS=	srt0.S cdboot.c pdc.c itecons.c dev_hppa64.c dk.c
+
+.PATH: ${.CURDIR}/../boot
+SRCS+= srt0.S
+
+SRCS=  srt0.S cdboot.c
+
+.PATH: ${.CURDIR}/../libsa
+SRCS+= pdc.c itecons.c dev_hppa64.c dk.c
+
+.PATH: ${S}/lib/libkern/arch/hppa ${S}/lib/libkern
+SRCS+= milli.S strlen.c strlcpy.c
+
 LD?=	ld
 LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR)
 LDFLAGS+=-T ${.CURDIR}/ld.script -Map cdboot.map
@@ -20,12 +31,8 @@ CRTEND=
 SAREL=
 USE_LOADFILE=yes
 .include "${S}/lib/libsa/Makefile.inc"
-DPADD+= $(SALIB) $(LIBKERN)
-LDADD+=	$(SALIB) $(LIBKERN)
-
-.PATH:	${S}/stand/boot
-.PATH:	${.CURDIR}/../boot
-.PATH:	${.CURDIR}/../libsa
+DPADD+= $(SALIB)
+LDADD+=	$(SALIB)
 
 all:	${PROG}