Post repocopy build fixes.

3 files changed, 25 insertions, 20 deletions

diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
index 2003b963..02921dc 100644
--- a/sys/boot/ia64/ski/Makefile
+++ b/sys/boot/ia64/ski/Makefile
@@ -1,34 +1,36 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
-
-PROG= 		skiload
+PROG=		skiload
 NOMAN=
 NEWVERSWHAT=	"ia64 SKI boot" ${MACHINE_ARCH}
-BINDIR?=	/boot
 STRIP=		# We must not strip skiload at install time.
 
-SRCS=		conf.c main.c start.S vers.c
+SRCS=		acpi_stub.c bootinfo.c conf.c copy.c delay.c devicename.c \
+		efi_stub.c elf_freebsd.c exit.c main.c pal_stub.S sal_stub.c \
+		skiconsole.c skifs.c ssc.c start.S time.c vers.c
+
+CFLAGS+=	-DLOADER
+CFLAGS+=	-I${.CURDIR}
+CFLAGS+=	-I${.CURDIR}/../../..
+CFLAGS+=	-I${.CURDIR}/../../efi/include
+CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
+LDFLAGS=	-Wl,-T${.CURDIR}/ldscript.ia64
 
 .if !defined(NOFORTH)
-# Enable BootForth
-BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH
-CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH}
+CFLAGS+=	-I${.CURDIR}/../../ficl
+CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_ARCH}
 LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
+BOOT_FORTH=	yes
 .endif
 
-LIBSKI=		${.OBJDIR}/../libski/libski.a
-
-# Always add MI sources 
+# Always add MI sources (needs BOOT_FORTH)
 .PATH: ${.CURDIR}/../../common
+CFLAGS+=	-I${.CURDIR}/../../common
 .include "${.CURDIR}/../../common/Makefile.inc"
 
-CFLAGS+= -I${.CURDIR}/../../common
-CFLAGS+= -I${.CURDIR}/../libski
-CFLAGS+= -DLOADER
-
-LDFLAGS=	-Wl,-T${.CURDIR}/ldscript.ia64
+DPADD=	${LIBFICL} ${LIBSTAND}
+LDADD=	${LIBFICL} -lstand
 
 CLEANFILES=	vers.c ${PROG}.help
 
@@ -41,7 +43,4 @@ ${PROG}.help: help.common
 
 FILES=	${PROG}.help
 
-DPADD=	${LIBFICL} ${LIBSKI} ${LIBSTAND}
-LDADD=	${LIBFICL} ${LIBSKI} -lstand
-
 .include <bsd.prog.mk>
diff --git a/sys/boot/ia64/ski/libski.h b/sys/boot/ia64/ski/libski.h
index 043177c..6fe8034 100644
--- a/sys/boot/ia64/ski/libski.h
+++ b/sys/boot/ia64/ski/libski.h
@@ -72,7 +72,6 @@ extern ssize_t		ski_copyout(const vm_offset_t src, void *dest, size_t len);
 extern ssize_t		ski_readin(int fd, vm_offset_t dest, size_t len);
 
 extern int		ski_boot(void);
-extern int		ski_autoload(void);
 
 struct bootinfo;
 struct preloaded_file;
diff --git a/sys/boot/ia64/ski/main.c b/sys/boot/ia64/ski/main.c
index f336d17..8660518 100644
--- a/sys/boot/ia64/ski/main.c
+++ b/sys/boot/ia64/ski/main.c
@@ -44,6 +44,13 @@ extern char bootprog_maker[];
 struct ski_devdesc	currdev;	/* our current device */
 struct arch_switch	archsw;		/* MI/MD interface boundary */
 
+static int
+ski_autoload(void)
+{
+
+	return (0);
+}
+
 void
 ski_main(void)
 {