From 43e797fd31d9ab615c908fe84b1367eaafe3fc28 Mon Sep 17 00:00:00 2001
From: Paul Saab <ps@FreeBSD.org>
Date: Fri, 21 Apr 2000 22:06:02 +0000
Subject: [PATCH] Move the building of the PXE module into libi386.

---
 sys/boot/i386/libi386/Makefile | 5 ++++-
 sys/boot/i386/loader/Makefile  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 074fba12636f..36ec6fddd0ca 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -8,7 +8,7 @@ INTERNALSTATICLIB=	true
 
 SRCS=	aout_freebsd.c biosdisk.c biosmem.c biospnp.c biospci.c \
 	bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \
-	i386_copy.c i386_module.c time.c vidconsole.c pxetramp.s
+	i386_copy.c i386_module.c time.c vidconsole.c pxe.c pxetramp.s
 
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
 		-I${.CURDIR}/../../.. -I.
@@ -19,6 +19,9 @@ CFLAGS+=	-DCOMPORT=${BOOT_COMCONSOLE_PORT}
 BOOT_COMCONSOLE_SPEED?= 9600
 CFLAGS+=	-DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
 
+# the location of libstand
+CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
+
 # Make the disk code more talkative
 #CFLAGS+= -DDISK_DEBUG
 
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index a6eea869d14f..16086055d571 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -10,7 +10,7 @@ NEWVERSWHAT=	"bootstrap loader" i386
 BINDIR?=	/boot
 
 # architecture-specific loader code
-SRCS=		main.c conf.c pxe.c
+SRCS=		main.c conf.c
 .PATH:		${.CURDIR}/../libi386
 
 # Enable PXE TFTP or NFS support, not both.
@@ -119,7 +119,7 @@ beforeinstall:
 
 ${BASE}.sym: ${OBJS} ${LIBI386} ${LIBSTAND} ${LIBFICL} vers.o
 	${CC} ${LDFLAGS} -o ${.TARGET} ${BTXCRT} ${OBJS} vers.o \
-		${LIBFICL} ${LIBSTAND} ${LIBI386} ${LIBSTAND}
+		${LIBFICL} ${LIBI386} ${LIBSTAND}
 
 # If it's not there, don't consider it a target
 .if exists(${.CURDIR}/../../../i386/include)