Commit 550e403f authored by Dave Reisner's avatar Dave Reisner Committed by Daniel Stenberg
Browse files

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)
parent f99430d8

docs/examples/Makefile.am

+4 −5
Original line number Diff line number Diff line
@@ -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 \

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

           -I$(top_srcdir)/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

lib/Makefile.am

+12 −14
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 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 \

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

              -I$(top_srcdir)/include        \

              -I$(top_builddir)/lib          \
@@ -72,15 +72,13 @@ INCLUDES = -I$(top_builddir)/include/curl \ 
              -I$(top_builddir)/ares         \

              -I$(top_srcdir)/ares

else

INCLUDES = -I$(top_builddir)/include/curl \

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

src/Makefile.am

+8 −8
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 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 \

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

              -I$(top_srcdir)/include        \

              -I$(top_builddir)/lib          \
@@ -46,7 +46,7 @@ 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

tests/libtest/Makefile.am

+12 −12
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 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 \

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

              -I$(top_srcdir)/include        \

              -I$(top_builddir)/lib          \
@@ -43,7 +43,7 @@ INCLUDES = -I$(top_builddir)/include/curl \ 
              -I$(top_builddir)/ares         \

              -I$(top_srcdir)/ares

else

INCLUDES = -I$(top_builddir)/include/curl \

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

              -I$(top_srcdir)/include        \

              -I$(top_builddir)/lib          \

tests/server/Makefile.am

+12 −12
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 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 \

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

              -I$(top_srcdir)/include        \

              -I$(top_builddir)/lib          \
@@ -43,7 +43,7 @@ INCLUDES = -I$(top_builddir)/include/curl \ 
              -I$(top_builddir)/ares         \

              -I$(top_srcdir)/ares

else

INCLUDES = -I$(top_builddir)/include/curl \

AM_CPPFLAGS = -I$(top_builddir)/include/curl \

              -I$(top_builddir)/include      \

              -I$(top_srcdir)/include        \

              -I$(top_builddir)/lib          \