generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uniformly use AM_CPPFLAGS, avoid deprecated INCLUDES

Browse Source 
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)
This commit is contained in:
Dave Reisner 2012-10-10 10:05:02 +02:00 committed by Daniel Stenberg
parent f99430d89e
commit 550e403f00
6 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/examples/Makefile.am
View File

@ -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_builddir)/include for generated curlbuild.h included from lib/setup.h
# $(top_srcdir)/include is for libcurl's external include files # $(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_builddir)/include \
-I$(top_srcdir)/include -I$(top_srcdir)/include \
-DCURL_NO_OLDIES
LIBDIR = $(top_builddir)/lib LIBDIR = $(top_builddir)/lib
AM_CPPFLAGS = -DCURL_NO_OLDIES
# Mostly for Windows build targets, when using static libcurl # Mostly for Windows build targets, when using static libcurl
if USE_CPPFLAG_CURL_STATICLIB if USE_CPPFLAG_CURL_STATICLIB
AM_CPPFLAGS += -DCURL_STATICLIB AM_CPPFLAGS += -DCURL_STATICLIB

26
lib/Makefile.am
View File

@ -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 # $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES if USE_EMBEDDED_ARES
INCLUDES = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_builddir)/ares \ -I$(top_builddir)/ares \
-I$(top_srcdir)/ares -I$(top_srcdir)/ares
else else
INCLUDES = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib -I$(top_srcdir)/lib
endif endif
AM_CPPFLAGS =
# Mostly for Windows build targets, when building libcurl library # Mostly for Windows build targets, when building libcurl library
if USE_CPPFLAG_BUILDING_LIBCURL if USE_CPPFLAG_BUILDING_LIBCURL
AM_CPPFLAGS += -DBUILDING_LIBCURL AM_CPPFLAGS += -DBUILDING_LIBCURL

16
src/Makefile.am
View File

@ -34,19 +34,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files # $(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 # $(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_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_builddir)/src \ -I$(top_builddir)/src \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/src -I$(top_srcdir)/src
bin_PROGRAMS = curl bin_PROGRAMS = curl
# Mostly for Windows build targets, when using static libcurl # Mostly for Windows build targets, when using static libcurl
if USE_CPPFLAG_CURL_STATICLIB if USE_CPPFLAG_CURL_STATICLIB
AM_CPPFLAGS = -DCURL_STATICLIB AM_CPPFLAGS += -DCURL_STATICLIB
endif endif
include Makefile.inc include Makefile.inc

24
tests/libtest/Makefile.am
View File

@ -35,19 +35,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/ares is for in-tree c-ares's external include files # $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES if USE_EMBEDDED_ARES
INCLUDES = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_builddir)/ares \ -I$(top_builddir)/ares \
-I$(top_srcdir)/ares -I$(top_srcdir)/ares
else else
INCLUDES = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib -I$(top_srcdir)/lib
endif endif
EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \ EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \

24
tests/server/Makefile.am
View File

@ -35,19 +35,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/ares is for in-tree c-ares's external include files # $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES if USE_EMBEDDED_ARES
INCLUDES = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_builddir)/ares \ -I$(top_builddir)/ares \
-I$(top_srcdir)/ares -I$(top_srcdir)/ares
else else
INCLUDES = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib -I$(top_srcdir)/lib
endif endif
if DOING_NATIVE_WINDOWS if DOING_NATIVE_WINDOWS

30
tests/unit/Makefile.am
View File

@ -35,28 +35,28 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/ares is for in-tree c-ares's external include files # $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES if USE_EMBEDDED_ARES
INCLUDES = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/tests/libtest \ -I$(top_srcdir)/tests/libtest \
-I$(top_builddir)/ares \ -I$(top_builddir)/ares \
-I$(top_srcdir)/ares -I$(top_srcdir)/ares
else else
INCLUDES = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/tests/libtest -I$(top_srcdir)/tests/libtest
endif endif
EXTRA_DIST = Makefile.inc EXTRA_DIST = Makefile.inc
LDADD = $(top_builddir)/lib/libcurlu.la @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ LDADD = $(top_builddir)/lib/libcurlu.la @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
DEPENDENCIES = $(top_builddir)/lib/libcurlu.la DEPENDENCIES = $(top_builddir)/lib/libcurlu.la
AM_CPPFLAGS = -DUNITTESTS AM_CPPFLAGS += -DUNITTESTS
# Mostly for Windows build targets, when using static libcurl # Mostly for Windows build targets, when using static libcurl
if USE_CPPFLAG_CURL_STATICLIB if USE_CPPFLAG_CURL_STATICLIB