Use EXTRA_CPPFLAGS where it needs to be used.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88668 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/rules.mk b/build/rules.mk
index 55a288a527be1ca5227c88e0b151b36408cfaecd..9850782ec7c1e4691cf4fce97df3089b7ae5793a 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -58,9 +58,9 @@ include $(top_builddir)/config_vars.mk
 
 # Compile commands
 
-COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
-COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(NOTEST_CFLAGS)
-CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
+COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(EXTRA_CPPFLAGS) $(CPPFLAGS)
+COMPILE      = $(CC)  $(COMMON_FLAGS) $(EXTRA_CFLAGS) $(CFLAGS) $(NOTEST_CFLAGS)
+CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(EXTRA_CXXFLAGS) $(CXXFLAGS)
 
 SH_COMPILE     = $(SH_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
 SH_CXX_COMPILE = $(SH_LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
@@ -182,7 +182,7 @@ distclean-p depend-p clean-p:
 
 depend: depend-recursive
        if test "`echo $(srcdir)/*.c`" != "$(srcdir)'/*.c'"; then \
-           gcc -MM $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c | sed 's/\.o:/.lo:/' > $(builddir)/.deps || true;           \
+           gcc -MM $(COMMON_FLAGS) $(srcdir)/*.c | sed 's/\.o:/.lo:/' > $(builddir)/.deps || true;           \
        fi
 #          test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps