whitespace cleanup

This commit is contained in:
lukem 2006-06-29 06:39:38 +00:00
parent e84a5a6bd9
commit 7a08c82b0b

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2006/06/29 06:37:19 lukem Exp $
# $NetBSD: Makefile,v 1.8 2006/06/29 06:39:38 lukem Exp $
S= ${.CURDIR}/../../../../..
S= ${.CURDIR}/../../../../..
NOMAN= # defined
STRIPFLAG= # nothing
@ -10,28 +10,28 @@ LIBCRTBEGIN= # nothing
LIBCRTEND= # nothing
LIBC= # nothing
PRIMARY_LOAD_ADDRESS=0x600
SECONDARY_LOAD_ADDRESS=0x10000
PRIMARY_LOAD_ADDRESS= 0x600
SECONDARY_LOAD_ADDRESS= 0x10000
.include <bsd.own.mk>
PROG= bootxx_cd9660
SRCS?= cdboot.S
PROG= bootxx_cd9660
SRCS?= cdboot.S
BINDIR= /usr/mdec
BINMODE=444
BINDIR= /usr/mdec
BINMODE= 444
.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../cdboot
.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../cdboot
LDFLAGS+= -nostdlib -Wl,-e,start
CPPFLAGS+= -I. -I${.CURDIR}/../../lib -I${S}
CPPFLAGS+= -DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS}
CPPFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS}
CPPFLAGS+= -DDISABLE_KEYPRESS
LDFLAGS+= -nostdlib -Wl,-e,start
CPPFLAGS+= -I. -I${.CURDIR}/../../lib -I${S}
CPPFLAGS+= -DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS}
CPPFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS}
CPPFLAGS+= -DDISABLE_KEYPRESS
.if ${MACHINE} == "amd64"
LDFLAGS+= -Wl,-m,elf_i386
AFLAGS+= -m32
LDFLAGS+= -Wl,-m,elf_i386
AFLAGS+= -m32
.endif
BUILDSYMLINKS+= $S/arch/i386/include machine \
@ -39,12 +39,14 @@ BUILDSYMLINKS+= $S/arch/i386/include machine \
DPSRCS+= machine x86
CLEANFILES+= ${PROG}.tmp
CLEANFILES+= ${PROG}.tmp
${PROG}: ${OBJS}
${_MKTARGET_LINK}
${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} ${OBJS}
@ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\<free_space\>' | sed 's/^0*//' ); \
${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} \
${OBJS}
@ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\<free_space\>' \
| sed 's/^0*//' ); \
echo "#### There are $$1 free bytes in ${PROG}"
${OBJCOPY} -O binary ${PROG}.tmp ${PROG}
rm -f ${PROG}.tmp