diff options
author | ru <ru@FreeBSD.org> | 2004-02-09 14:11:58 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2004-02-09 14:11:58 +0000 |
commit | 5d659b9c9153cac8ef26ac894913d84a6772d779 (patch) | |
tree | 8ce2d80f6b9077e83a792c0cc593b1328ab46eb6 /sys/boot/i386/pxeldr | |
parent | 951150d25a152b9b7302661fb693e51d0ffe17f1 (diff) | |
download | FreeBSD-src-5d659b9c9153cac8ef26ac894913d84a6772d779.zip FreeBSD-src-5d659b9c9153cac8ef26ac894913d84a6772d779.tar.gz |
- Factor out -nostdlib to an upper level Makefile.inc.
- Now that bsd.prog.mk deals with programs linked with -nostdlib
better, and has a notion of an "internal" program, use PROG
where possible. This has a good impact on the contents of
.depend files and causes programs to be linked with cc(1).
XXX: boot2 couldn't be converted as it's actually two programs.
Tested on: i386, amd64
Diffstat (limited to 'sys/boot/i386/pxeldr')
-rw-r--r-- | sys/boot/i386/pxeldr/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile index 1f779ec..3d9228f 100644 --- a/sys/boot/i386/pxeldr/Makefile +++ b/sys/boot/i386/pxeldr/Makefile @@ -3,8 +3,11 @@ # Pick up ../Makefile.inc early. .include <bsd.init.mk> +PROG= ${LDR}.out +INTERNALPROG= FILES= ${BOOT} MAN= ${BOOT}.8 +SRCS= ${LDR}.s CLEANFILES= ${BOOT} BOOT= pxeboot @@ -21,11 +24,7 @@ M4FLAGS+= -DPROBE_KEYBOARD M4FLAGS+= -DALWAYS_SERIAL .endif -.if exists(${.OBJDIR}/../loader) LOADERBIN= ${.OBJDIR}/../loader/loader.bin -.else -LOADERBIN= ${.CURDIR}/../loader/loader.bin -.endif CLEANFILES+= ${BOOT}.tmp @@ -34,13 +33,12 @@ ${BOOT}: ${LDR} ${LOADER} dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync rm ${.TARGET}.tmp -CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o +CLEANFILES+= ${LDR} ${LDR}: ${LDR}.out objcopy -S -O binary ${LDR}.out ${.TARGET} -${LDR}.out: ${LDR}.o - ${LD} -N -e start -Ttext ${ORG} -o ${.TARGET} ${LDR}.o +LDFLAGS+= -N -e start -Ttext ${ORG} ${LDR}.o: ${LDR}.s (cd ${.CURDIR}; ${M4} ${M4FLAGS} ${LDR}.s) | \ |