There's no reason to keep separate AINC knob anymore.

The only real use of it (lib/libc/Makefile) has been
fixed, and if necessary, the contents of AINC should
be added to CFLAGS.

Explained by:	bde

3 files changed, 8 insertions, 17 deletions

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 70e54f6..61bd54d 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -114,16 +114,10 @@ depend: beforedepend ${DEPENDFILE} afterdepend
 # Split up the sources, and filter out headers and non-applicable flags.
 ${DEPENDFILE}: ${SRCS}
 	rm -f ${DEPENDFILE}
-.if ${SRCS:M*.[sS]} != ""
+.if ${SRCS:M*.[cSs]} != ""
 	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
 	    ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \
-	    ${AINC} \
-	    ${.ALLSRC:M*.[sS]}
-.endif
-.if ${SRCS:M*.c} != ""
-	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
-	    ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \
-	    ${.ALLSRC:M*.c}
+	    ${.ALLSRC:M*.[cSs]}
 .endif
 .if ${SRCS:M*.cc} != "" || ${SRCS:M*.C} != "" || ${SRCS:M*.cpp} != "" || \
     ${SRCS:M*.cxx} != ""
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index baf8462..72b5f2d 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -71,23 +71,20 @@ PICFLAG=-fpic
 	${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 .s.o .asm.o:
-	${CC} -x assembler-with-cpp ${CFLAGS} ${AINC} -c \
-	    ${.IMPSRC} -o ${.TARGET}
+	${CC} -x assembler-with-cpp ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 .s.po .asm.po:
-	${CC} -x assembler-with-cpp -DPROF ${CFLAGS} ${AINC} -c \
-	    ${.IMPSRC} -o ${.TARGET}
+	${CC} -x assembler-with-cpp -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 .s.So .asm.So:
 	${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \
-	    ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+	    -c ${.IMPSRC} -o ${.TARGET}
 
 .S.po:
-	${CC} -DPROF ${CFLAGS} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+	${CC} -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 .S.So:
-	${CC} ${PICFLAG} -DPIC ${CFLAGS} ${AINC} -c ${.IMPSRC} \
-	    -o ${.TARGET}
+	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 all: objwarn
 
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index c2b4c74..219ab7a 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -206,7 +206,7 @@ MACHINE_ARCH	?=	i386
 	${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} -c ${.IMPSRC}
 
 .S.o:
-	${CC} ${CFLAGS} ${AINC} -c ${.IMPSRC}
+	${CC} ${CFLAGS} -c ${.IMPSRC}
 
 .s.o .asm.o:
 	${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}