diff options
| author | ru <ru@FreeBSD.org> | 2004-04-28 21:31:21 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-04-28 21:31:21 +0000 |
| commit | d6a9edf5bf2890321be3f550ff82093600c0eb44 (patch) | |
| tree | b86bcd3d87bd5f0b94e39d2da5b8e5c83018969a /sys/boot | |
| parent | 7285dd0c50aad72c495dcea37b153d4c14767e67 (diff) | |
| download | FreeBSD-src-d6a9edf5bf2890321be3f550ff82093600c0eb44.zip FreeBSD-src-d6a9edf5bf2890321be3f550ff82093600c0eb44.tar.gz | |
Thanks to David's patches, we can now simplify these makefiles
further, and just use PROG directly (without FILES).
Suggested by: bde
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/boot0/Makefile | 10 | ||||
| -rw-r--r-- | sys/boot/i386/boot0ext/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/boot0sio/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/cdboot/Makefile | 9 | ||||
| -rw-r--r-- | sys/boot/i386/mbr/Makefile | 9 |
5 files changed, 14 insertions, 18 deletions
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile index 2a36e40..40ebc8f 100644 --- a/sys/boot/i386/boot0/Makefile +++ b/sys/boot/i386/boot0/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -PROG= ${BOOT} -INTERNALPROG= -FILES= ${BOOT} +PROG?= boot0 +STRIP= +BINMODE=${NOBINMODE} NOMAN= -SRCS= ${BOOT}.S - -BOOT?= boot0 +SRCS= ${PROG}.S # The default set of flags compiled into boot0. This enables update (writing # the modified boot0 back to disk after running so that the selection made is diff --git a/sys/boot/i386/boot0ext/Makefile b/sys/boot/i386/boot0ext/Makefile index 3458fc1..e68e237 100644 --- a/sys/boot/i386/boot0ext/Makefile +++ b/sys/boot/i386/boot0ext/Makefile @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../boot0 -BOOT= boot0ext +PROG= boot0ext .include "${.CURDIR}/../boot0/Makefile" diff --git a/sys/boot/i386/boot0sio/Makefile b/sys/boot/i386/boot0sio/Makefile index a6b6ae1..1321dd3 100644 --- a/sys/boot/i386/boot0sio/Makefile +++ b/sys/boot/i386/boot0sio/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../boot0 -FILESNAME= boot0sio +PROGNAME= boot0sio CFLAGS+= -DSIO .include "${.CURDIR}/../boot0/Makefile" diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile index 6cc382d..ddca825 100644 --- a/sys/boot/i386/cdboot/Makefile +++ b/sys/boot/i386/cdboot/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PROG= ${BOOT} -INTERNALPROG= -FILES= ${BOOT} +PROG= cdboot +STRIP= +BINMODE=${NOBINMODE} NOMAN= -SRCS= ${BOOT}.s +SRCS= ${PROG}.s -BOOT= cdboot ORG= 0x7c00 LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile index 43320e1..2eb349c 100644 --- a/sys/boot/i386/mbr/Makefile +++ b/sys/boot/i386/mbr/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PROG= ${BOOT} -INTERNALPROG= -FILES= ${BOOT} +PROG= mbr +STRIP= +BINMODE=${NOBINMODE} NOMAN= -SRCS= ${BOOT}.s +SRCS= ${PROG}.s -BOOT= mbr ORG= 0x600 LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary |
