From 550e403f0023e1ca6c50a658e2d994e7f89d576b Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 10 Oct 2012 10:05:02 +0200 Subject: 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 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'docs') 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 -- cgit v1.2.3