summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2013-02-18 10:38:22 (GMT)
committerYang Tse <yangsita@gmail.com>2013-02-19 13:14:09 (GMT)
commit320c4eb65956ca7f4b1bce4397277a31881ed54a (patch)
tree2fc2463dbbadbceed51d480908f571b3ccbe87ff
parent9ed49f3e17b988c6acb3a3b713307485808fc6fe (diff)
downloadc-ares-320c4eb65956ca7f4b1bce4397277a31881ed54a.zip
c-ares-320c4eb65956ca7f4b1bce4397277a31881ed54a.tar.gz
c-ares-320c4eb65956ca7f4b1bce4397277a31881ed54a.tar.bz2
Makefile.am: use AM_CPPFLAGS instead of INCLUDES
-rw-r--r--Makefile.am22
1 files changed, 10 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index 063406d..3b98a29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,16 +22,16 @@ ACLOCAL_AMFLAGS = -I m4
# $(top_srcdir) is for c-ares's ares_setup.h and other "c-ares-private" files
if CURLDEBUG
-INCLUDES = -I$(top_builddir)/../include/curl \
- -I$(top_builddir)/../include \
- -I$(top_srcdir)/../include \
- -I$(top_builddir)/../lib \
- -I$(top_srcdir)/../lib \
- -I$(top_builddir) \
- -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir)/../include/curl \
+ -I$(top_builddir)/../include \
+ -I$(top_srcdir)/../include \
+ -I$(top_builddir)/../lib \
+ -I$(top_srcdir)/../lib \
+ -I$(top_builddir) \
+ -I$(top_srcdir)
else
-INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) \
+ -I$(top_srcdir)
endif
lib_LTLIBRARIES = libcares.la
@@ -107,9 +107,7 @@ CFLAG_CARES_SYMBOL_HIDING = @CFLAG_CARES_SYMBOL_HIDING@
# For Windows build targets, when building or using static c-ares
if USE_CPPFLAG_CARES_STATICLIB
-AM_CPPFLAGS = -DCARES_STATICLIB
-else
-AM_CPPFLAGS =
+AM_CPPFLAGS += -DCARES_STATICLIB
endif
if DOING_CARES_SYMBOL_HIDING