Clean up/standardise makefiles for amd64/stand.

1 files changed, 18 insertions, 19 deletions

diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index 2705ea74217..557fd32a67b 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,15 +1,15 @@
-#	$OpenBSD: Makefile,v 1.17 2012/10/27 15:43:42 jsing Exp $
-
-.include "${.CURDIR}/../Makefile.inc"
+#	$OpenBSD: Makefile,v 1.18 2013/01/17 12:25:11 jsing Exp $
 
 MAN?=	boot.8
 MLINKS?=boot.8 boot.conf.5
 
 .if ${MACHINE} == "amd64"
-S	=${.CURDIR}/../../../..
+S=	${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
-.if empty(CFLAGS:M-DFDBOOT)
+.if !empty(CFLAGS:M-DFDBOOT)
+SOFTRAID=no
+.else
 SOFTRAID=yes
 .endif
 
@@ -21,26 +21,25 @@ LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie
 LDFLAGS+=-melf_i386 -L/usr/libdata 
 
 .PATH:	${SADIR}/libsa
-# i386 stuff (so, it will possibly load in the same 64k)
-SRCS+=	machdep.c dev_i386.c exec_i386.c cmd_i386.c
-SRCS+=	gidt.S alloca.S biosdev.c bioscons.c gateA20.c \
-	memprobe.c diskprobe.c time.c ## biosprobe.c
-.if defined(SOFTRAID)
+SRCS+=	alloca.S gidt.S
+SRCS+=	cmd_i386.c dev_i386.c exec_i386.c gateA20.c machdep.c
+SRCS+=	bioscons.c biosdev.c diskprobe.c memprobe.c time.c
+.if ${SOFTRAID:L} == "yes"
 SRCS+=	softraid.c
 .endif
 
 .PATH:	${S}/stand/boot
-SRCS+=	boot.c cmd.c vars.c bootarg.c
+SRCS+=	boot.c bootarg.c cmd.c vars.c
 
 .PATH:	${S}/lib/libsa
-SRCS+=	alloc.c exit.c getfile.c gets.c globals.c strcmp.c strlen.c \
-	strncmp.c memcmp.c memcpy.c memset.c printf.c snprintf.c \
-	strerror.c strncpy.c strtol.c strtoll.c ctime.c strlcpy.c strlcat.c
-SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \
-	open.c read.c stat.c write.c cread.c readdir.c cons.c loadfile.c \
-	elf32.c elf64.c
+SRCS+=	alloc.c ctime.c exit.c getfile.c gets.c globals.c memcmp.c memcpy.c \
+	memset.c printf.c snprintf.c strcmp.c strerror.c strlcat.c strlcpy.c \
+	strlen.c strncmp.c strncpy.c strtol.c strtoll.c
+SRCS+=	close.c closeall.c cons.c cread.c dev.c disklabel.c dkcksum.c fstat.c \
+	ioctl.c lseek.c open.c read.c readdir.c stat.c write.c
+SRCS+=	elf32.c elf64.c loadfile.c
 SRCS+=	ufs.c
-.if defined(SOFTRAID)
+.if ${SOFTRAID:L} == "yes"
 SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pbkdf2.c rijndael.c sha1.c
 .endif
 
@@ -67,7 +66,7 @@ NOPROG=
 
 .include <bsd.prog.mk>
 
-.if defined(SOFTRAID)
+.if ${SOFTRAID:L} == "yes"
 CPPFLAGS+=-DSOFTRAID
 .endif
 CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS} -DLINKADDR=${LINKADDR}