summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwsanchez <wsanchez@13f79535-47bb-0310-9956-ffa450edef68>2001-02-09 20:09:23 +0000
committerwsanchez <wsanchez@13f79535-47bb-0310-9956-ffa450edef68>2001-02-09 20:09:23 +0000
commit938fc1c11facbaf635029ad4342a4810e6ec6268 (patch)
treeba655fcdeb6d18a07f21934caf82c73bdfb61a9f
parentbc4aad73c989202f213c08af42f5ecb46acd0783 (diff)
downloadlibapr-938fc1c11facbaf635029ad4342a4810e6ec6268.tar.gz
Separate CFLAGS and CPPFLAGS.
(Allows overriding CFLAGS without clobbering include paths abnd defines.) git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61203 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--helpers/rules.mk.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/helpers/rules.mk.in b/helpers/rules.mk.in
index 097c1c34d..56b54e637 100644
--- a/helpers/rules.mk.in
+++ b/helpers/rules.mk.in
@@ -67,7 +67,8 @@ CC=@CC@
AWK=@AWK@
LIBTOOL=@LIBTOOL@
-CFLAGS=@CFLAGS@ @OPTIM@ $(INCLUDES)
+CFLAGS=@CFLAGS@ @OPTIM@
+CPPFLAGS=@CPPFLAGS@ $(INCLUDES)
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
@@ -82,7 +83,7 @@ MKDEP=$(top_builddir)/helpers/mkdep.sh
#
# Basic macro setup
#
-COMPILE = $(CC) $(CFLAGS)
+COMPILE = $(CC) $(CFLAGS) $(CPPFLAGS)
LT_COMPILE = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< && touch $@
LINK = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@
@@ -138,8 +139,8 @@ local-all: $(TARGETS)
local-depend:
@if test -n "`ls *.c 2> /dev/null`"; then \
- echo $(MKDEP) $(INCLUDES) $(CFLAGS) *.c ; \
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c ; \
+ echo $(MKDEP) $(CFLAGS) $(CPPFLAGS) *.c ; \
+ $(MKDEP) $(CFLAGS) $(CPPFLAGS) *.c ; \
fi
# to be filled in by the actual Makefile