--- src/sys/boot/i386/btx/btx/Attic/Makefile 2003/11/10 06:08:35 1.3 +++ src/sys/boot/i386/btx/btx/Attic/Makefile 2004/07/18 23:40:04 1.4 @@ -1,10 +1,8 @@ # $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.13 2002/09/17 01:48:54 peter Exp $ # $DragonFly$ -M4?= m4 - .if defined(PAGING) -M4FLAGS+= -DPAGING +AFLAGS+= -DPAGING .endif .if defined(BOOT_BTX_NOHANG) @@ -13,14 +11,14 @@ BOOT_BTX_FLAGS=0x1 BOOT_BTX_FLAGS=0x0 .endif -AFLAGS+= --defsym BTX_FLAGS=${BOOT_BTX_FLAGS} +AFLAGS+= -DBTX_FLAGS=${BOOT_BTX_FLAGS} .if defined(BTX_SERIAL) BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3 -M4FLAGS+= -DBTX_SERIAL -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ +AFLAGS+= -DBTX_SERIAL -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ -DSIOFMT=${B2SIOFMT} -DSIOSPD=${BOOT_COMCONSOLE_SPEED} .endif @@ -32,9 +30,8 @@ btx: btx.o ${LD} -N -e start -Ttext ${ORG} -o btx.out btx.o objcopy -S -O binary btx.out ${.TARGET} -btx.o: btx.s - (cd ${.CURDIR}; ${M4} ${M4FLAGS} btx.s) | \ - ${AS} ${AFLAGS} -o ${.TARGET} +btx.o: btx.S + ${CC} ${CFLAGS} ${AFLAGS} ${.IMPSRC} -o ${.TARGET} -c CLEANFILES+= btx btx.out btx.o