First round of cleanups to sys/boot/ makefiles:

- do not use PROG for what's not a real C program,
- use sys.mk transformation rules where possible,
- only create the "machine" symlink on AMD64,
- removed MAINTAINER lines in individual makefiles,
- added the LIBSTAND defitinion to <bsd.libnames.mk>,
- somewhat better contents in .depend files.

Tested on:	i386, amd64
Prodded by:	bde

1 files changed, 26 insertions, 30 deletions

diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile
index 9e533cb..1f779ec 100644
--- a/sys/boot/i386/pxeldr/Makefile
+++ b/sys/boot/i386/pxeldr/Makefile
@@ -1,59 +1,55 @@
 # $FreeBSD$
 
-MAINTAINER=jhb@FreeBSD.org
+# Pick up ../Makefile.inc early.
+.include <bsd.init.mk>
 
-ORG=		0x7c00
+FILES=	${BOOT}
+MAN=	${BOOT}.8
+CLEANFILES= ${BOOT}
 
-LDR=		pxeldr
-BOOT=		pxeboot
-LOADER=		loader
-PROG=		${BOOT}
-MAN=		${BOOT}.8
-STRIP=
-M4?=		m4
+BOOT=	pxeboot
+LDR=	pxeldr
+ORG=	0x7c00
+LOADER=	loader
+M4?=	m4
 
 .if defined(BOOT_PXELDR_PROBE_KEYBOARD)
-M4FLAGS+=	-DPROBE_KEYBOARD
+M4FLAGS+= -DPROBE_KEYBOARD
 .endif
 
 .if defined(BOOT_PXELDR_ALWAYS_SERIAL)
-M4FLAGS+=	-DALWAYS_SERIAL
+M4FLAGS+= -DALWAYS_SERIAL
 .endif
 
-
 .if exists(${.OBJDIR}/../loader)
-LOADERBIN=	${.OBJDIR}/../loader/loader.bin
+LOADERBIN= ${.OBJDIR}/../loader/loader.bin
 .else
-LOADERBIN=	${.CURDIR}/../loader/loader.bin
+LOADERBIN= ${.CURDIR}/../loader/loader.bin
 .endif
 
-# BTX components
-.if exists(${.OBJDIR}/../btx)
-BTXDIR=		${.OBJDIR}/../btx
-.else
-BTXDIR=		${.CURDIR}/../btx
-.endif
-BTXLDR=		${BTXDIR}/btxldr/btxldr
-BTXKERN=	${BTXDIR}/btx/btx
-BTXCRT=		${BTXDIR}/lib/crt0.o
+CLEANFILES+= ${BOOT}.tmp
 
 ${BOOT}: ${LDR} ${LOADER}
 	cat ${LDR} ${LOADER} > ${.TARGET}.tmp
 	dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
 	rm ${.TARGET}.tmp
 
-${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN} ${BTXCRT}
-	btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
-	    -b ${BTXKERN} ${LOADERBIN}
+CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o
 
-${LDR}: ${LDR}.o
-	${LD} -N -e start -Ttext ${ORG} -o ${LDR}.out ${LDR}.o
+${LDR}: ${LDR}.out
 	objcopy -S -O binary ${LDR}.out ${.TARGET}
 
+${LDR}.out: ${LDR}.o
+	${LD} -N -e start -Ttext ${ORG} -o ${.TARGET} ${LDR}.o
+
 ${LDR}.o: ${LDR}.s
 	(cd ${.CURDIR}; ${M4} ${M4FLAGS} ${LDR}.s) | \
-	   ${AS} ${AFLAGS} -o ${.TARGET}
+	    ${AS} ${AFLAGS} -o ${.TARGET}
+
+CLEANFILES+= ${LOADER}
 
-CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o ${BOOT}.tmp ${LOADER}
+${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN}
+	btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
+	    -b ${BTXKERN} ${LOADERBIN}
 
 .include <bsd.prog.mk>