From 471cf28bb0d16f2ba41f35da165c7ecf71d7dbfe Mon Sep 17 00:00:00 2001
From: Michael Graff <mgraff@isc.org>
Date: Wed, 28 Mar 2007 22:36:26 +0000
Subject: [PATCH] add ALL_CFLAGS to the makedep options.  Since we always use
 our mkdep this should be safe across all platforms.

---
 make/rules.in | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/make/rules.in b/make/rules.in
index 5d0659c175..5ee44abcd0 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.60 2007/01/29 23:57:22 marka Exp $
+# $Id: rules.in,v 1.61 2007/03/28 22:36:26 explorer Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -152,34 +152,34 @@ depend:
 	done
 	@if [ X"${VPATH}" != X ] ; then \
 		if [ X"${SRCS}" != X -a X"${PSRCS}" != X ] ; then \
-			echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${SRCS}; \
-			${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${SRCS}; \
-			echo ${MKDEP} -vpath ${VPATH} -ap ${ALL_CPPFLAGS} ${PSRCS}; \
-			${MKDEP} -vpath ${VPATH} -ap ${ALL_CPPFLAGS} ${PSRCS}; \
+			echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+			${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+			echo ${MKDEP} -vpath ${VPATH} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
+			${MKDEP} -vpath ${VPATH} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
 			${DEPENDEXTRA} \
 		elif [ X"${SRCS}" != X ] ; then \
-			echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${SRCS}; \
-			${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${SRCS}; \
+			echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+			${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
 			${DEPENDEXTRA} \
 		elif [ X"${PSRCS}" != X ] ; then \
-			echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${PSRCS}; \
-			${MKDEP} -vpath ${VPATH} -p ${ALL_CPPFLAGS} ${PSRCS}; \
+			echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
+			${MKDEP} -vpath ${VPATH} -p ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
 			${DEPENDEXTRA} \
 		fi \
 	else \
 		if [ X"${SRCS}" != X -a X"${PSRCS}" != X ] ; then \
-			echo ${MKDEP} ${ALL_CPPFLAGS} ${SRCS}; \
-			${MKDEP} ${ALL_CPPFLAGS} ${SRCS}; \
-			echo ${MKDEP} -ap ${ALL_CPPFLAGS} ${PSRCS}; \
-			${MKDEP} -ap ${ALL_CPPFLAGS} ${PSRCS}; \
+			echo ${MKDEP} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+			${MKDEP} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+			echo ${MKDEP} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
+			${MKDEP} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
 			${DEPENDEXTRA} \
 		elif [ X"${SRCS}" != X ] ; then \
-			echo ${MKDEP} ${ALL_CPPFLAGS} ${SRCS}; \
-			${MKDEP} ${ALL_CPPFLAGS} ${SRCS}; \
+			echo ${MKDEP} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+			${MKDEP} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
 			${DEPENDEXTRA} \
 		elif [ X"${PSRCS}" != X ] ; then \
-			echo ${MKDEP} ${ALL_CPPFLAGS} ${PSRCS}; \
-			${MKDEP} -p ${ALL_CPPFLAGS} ${PSRCS}; \
+			echo ${MKDEP} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
+			${MKDEP} -p ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
 			${DEPENDEXTRA} \
 		fi \
 	fi