From 862fb8354d729e9790a35a04dce4f7de09eb0770 Mon Sep 17 00:00:00 2001
From: Arun Thomas <arun@minix3.org>
Date: Fri, 5 Aug 2011 13:59:44 +0200
Subject: [PATCH] minix.ack.mk: use CPPFLAGS for ACK asm files

---
 kernel/Makefile       | 1 -
 lib/Makefile.inc      | 2 --
 share/mk/bsd.own.mk   | 3 +--
 share/mk/minix.ack.mk | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index cae155cd8..d67c683e6 100644
--- 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 0e8137f86..fd55c1cd1 100644
--- 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 2c9deb90c..b945b4fcf 100644
--- 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 538f7e9f8..fb39bf85f 100644
--- 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
-- 
2.44.0