minix.ack.mk: use CPPFLAGS for ACK asm files

diff --git a/kernel/Makefile b/kernel/Makefile
index cae155cd85ef73a415974977a087b0c627bc6fe4..d67c683e6b6819f196b437978f0783d73b8520ac 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -35,7 +35,6 @@ DPADD+=       ${LIBC}
 .endif
 
 CPPFLAGS+=     -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR}
-AFLAGS+=       -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR}
 
 INSTALLFLAGS+= -S 0
 BINDIR=        /usr/sbin

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 0e8137f86cfe224812a520ff609873e7dbc5e106..fd55c1cd122a7d5a95da3aaa085549e6d3770bc6 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,7 +1,5 @@
 .if defined(NBSD_LIBC) && (${NBSD_LIBC} == "yes")
 CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE
-AFLAGS+= -D_MINIX
 .else
 CPPFLAGS+= -D_MINIX -D_POSIX_SOURCE
-AFLAGS+= -D_MINIX -D_POSIX_SOURCE
 .endif

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 2c9deb90c6c18fe4168fdf97e4266d057c983c09..b945b4fcf42bd7860f22ffa484bdc65df87b1cb5 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -10,8 +10,7 @@ SMP_FLAGS += -DCONFIG_MAX_CPUS=${CONFIG_MAX_CPUS}
 .endif
 .endif
 
-CFLAGS += ${SMP_FLAGS}
-AFLAGS += ${SMP_FLAGS}
+CPPFLAGS+= ${SMP_FLAGS}
 
 MAKECONF?=     /etc/make.conf
 .-include "${MAKECONF}"

diff --git a/share/mk/minix.ack.mk b/share/mk/minix.ack.mk
index 538f7e9f8646e892f8ba862a2d87da75120833ae..fb39bf85fd2bef05a546f1781a34421d36b0cc6f 100644 (file)
--- a/share/mk/minix.ack.mk
+++ b/share/mk/minix.ack.mk
@@ -12,7 +12,7 @@ CPPFLAGS+= -wo
 
 ASMCONV=gas2ack
 AFLAGS+=-D__ASSEMBLY__ -w -wo
-CPP.s=${CC} -E ${AFLAGS}
+CPP.s=${CC} -E ${AFLAGS} ${CPPFLAGS}
 ASMCONVFLAGS+=-mi386
 
 # Need to convert ACK assembly files to GNU assembly before building