From 550e403f0023e1ca6c50a658e2d994e7f89d576b Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 10 Oct 2012 10:05:02 +0200 Subject: [PATCH] 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) --- docs/examples/Makefile.am | 9 ++++----- lib/Makefile.am | 26 ++++++++++++-------------- src/Makefile.am | 16 ++++++++-------- tests/libtest/Makefile.am | 24 ++++++++++++------------ tests/server/Makefile.am | 24 ++++++++++++------------ tests/unit/Makefile.am | 30 +++++++++++++++--------------- 6 files changed, 63 insertions(+), 66 deletions(-) diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 27d20dfb6..eb4e7c767 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -34,14 +34,13 @@ EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \ # $(top_builddir)/include for generated curlbuild.h included from lib/setup.h # $(top_srcdir)/include is for libcurl's external include files -INCLUDES = -I$(top_builddir)/include/curl \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -DCURL_NO_OLDIES LIBDIR = $(top_builddir)/lib -AM_CPPFLAGS = -DCURL_NO_OLDIES - # Mostly for Windows build targets, when using static libcurl if USE_CPPFLAG_CURL_STATICLIB AM_CPPFLAGS += -DCURL_STATICLIB 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 diff --git a/src/Makefile.am b/src/Makefile.am index 6e8ce38a1..b53127d27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,19 +34,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc # $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files # $(top_srcdir)/src is for curl's src/tool_setup.h and "curl-private" files -INCLUDES = -I$(top_builddir)/include/curl \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/src bin_PROGRAMS = curl # Mostly for Windows build targets, when using static libcurl if USE_CPPFLAG_CURL_STATICLIB -AM_CPPFLAGS = -DCURL_STATICLIB +AM_CPPFLAGS += -DCURL_STATICLIB endif include Makefile.inc diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 7b8d8fc04..bc9f532ae 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -35,19 +35,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc # $(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 EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \ diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am index 9d58e085f..7e6db1ffe 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -35,19 +35,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc # $(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 if DOING_NATIVE_WINDOWS diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 78166f869..058216814 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -35,28 +35,28 @@ AUTOMAKE_OPTIONS = foreign nostdinc # $(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_srcdir)/tests/libtest \ - -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_srcdir)/tests/libtest \ + -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 \ - -I$(top_srcdir)/tests/libtest +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_srcdir)/tests/libtest endif EXTRA_DIST = Makefile.inc LDADD = $(top_builddir)/lib/libcurlu.la @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ DEPENDENCIES = $(top_builddir)/lib/libcurlu.la -AM_CPPFLAGS = -DUNITTESTS +AM_CPPFLAGS += -DUNITTESTS # Mostly for Windows build targets, when using static libcurl if USE_CPPFLAG_CURL_STATICLIB