diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-10-10 10:05:02 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-11-06 00:32:21 +0100 |
| commit | 550e403f0023e1ca6c50a658e2d994e7f89d576b (patch) | |
| tree | f4caedcfe3bba379f94f49feeed3585fa1930dc5 /lib | |
| parent | f99430d89ecccf2a899a743d6c856102e967e32a (diff) | |
| download | curl-550e403f0023e1ca6c50a658e2d994e7f89d576b.tar.gz | |
uniformly use AM_CPPFLAGS, avoid deprecated INCLUDES
Since automake 1.12.4, the warnings are issued on running automake:
warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
Avoid INCLUDES and roll these flags into AM_CPPFLAGS.
Compile tested on:
Ubuntu 10.04 (automake 1:1.11.1-1)
Ubuntu 12.04 (automake 1:1.11.3-1ubuntu2)
Arch Linux (automake 1.12.4)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index a9f5a8e99..f00b14340 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -64,23 +64,21 @@ CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@ # $(top_srcdir)/ares is for in-tree c-ares's external include files if USE_EMBEDDED_ARES -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)/ares \ - -I$(top_srcdir)/ares +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)/ares \ + -I$(top_srcdir)/ares else -INCLUDES = -I$(top_builddir)/include/curl \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib +AM_CPPFLAGS = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib endif -AM_CPPFLAGS = - # Mostly for Windows build targets, when building libcurl library if USE_CPPFLAG_BUILDING_LIBCURL AM_CPPFLAGS += -DBUILDING_LIBCURL |