MFi386: Factor out -nostdlib and use PROG.

3 files changed, 23 insertions, 15 deletions

diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile
index 3b8408d..eb5d234 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/sys/boot/pc98/btx/btx/Makefile
@@ -1,5 +1,11 @@
 # $FreeBSD$
 
+PROG=	btx.out
+INTERNALPROG=
+NOMAN=
+SRCS=	btx.s
+CLEANFILES= btx
+
 M4?=	m4
 
 .if defined(PAGING)
@@ -28,14 +34,13 @@ ORG=	0x9000
 
 all: btx
 
-btx: btx.o
-	${LD} -N -e start -Ttext ${ORG} -o btx.out btx.o
+LDFLAGS=-N -e start -Ttext ${ORG}
+
+btx: btx.out
 	objcopy -S -O binary btx.out ${.TARGET}
 
 btx.o: btx.s
 	(cd ${.CURDIR}; ${M4} ${M4FLAGS} btx.s) | \
 	   ${AS} ${AFLAGS} -o ${.TARGET}
 
-CLEANFILES+= btx btx.out btx.o
-
 .include <bsd.prog.mk>
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index f19e6a4..1c8ed64 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/sys/boot/pc98/btx/btxldr/Makefile
@@ -1,5 +1,11 @@
 # $FreeBSD$
 
+PROG=	btxldr.out
+INTERNALPROG=
+NOMAN=
+SRCS=	btxldr.s
+CLEANFILES= btxldr
+
 M4?=	m4
 M4FLAGS+=	-DLOADER_ADDRESS=${LOADER_ADDRESS} -DPC98
 
@@ -9,14 +15,13 @@ M4FLAGS+=	-DBTXLDR_VERBOSE
 
 all: btxldr
 
-btxldr: btxldr.o
-	${LD} -N -e start -Ttext ${LOADER_ADDRESS} -o btxldr.out btxldr.o
+LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS}
+
+btxldr: btxldr.out
 	objcopy -S -O binary btxldr.out ${.TARGET}
 
 btxldr.o: btxldr.s
 	(cd ${.CURDIR}; ${M4} ${M4FLAGS} btxldr.s ) | \
 		${AS} ${AFLAGS} -o ${.TARGET}
 
-CLEANFILES+= btxldr btxldr.out btxldr.o
-
 .include <bsd.prog.mk>
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index fb56ca1..563f001 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
-OBJS=		btxcsu.o btxsys.o btxv86.o
-CLEANFILES=	crt0.o
-
-all: crt0.o
-
-crt0.o: ${OBJS}
-	${LD} ${LDFLAGS} -i -o ${.TARGET} ${OBJS}
+PROG=	crt0.o
+INTERNALPROG=
+NOMAN=
+SRCS=	btxcsu.s btxsys.s btxv86.s
+LDFLAGS=-Wl,-r
 
 .include <bsd.prog.mk>