maint: Prefer AM_CPPFLAGS over INCLUDES

Our use of INCLUDES in Makefile.am hearkens back to when we had to
cater to automake 1.9.6 (thanks, RHEL 5) which lacked AM_CPPFLAGS.
Modern Automake flags a warning that INCLUDES is deprecated, and
now that we mandate RHEL 7 or better (see commit c1bc9c66), we no
longer have to cater to the old spelling.  This change will also
make it easier to do per-binary CPPFLAGS.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5b1f6a05230fa90653134d9e706200feae4c5674..61cf2af4a5b43e72b1d121ace80170501d755794 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -33,7 +33,8 @@ EXTRA_DIST = \
        $(wildcard $(srcdir)/xml/test/*.xml)
 
 
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
+AM_CPPFLAGS = \
+       -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
        -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib
 LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \
        $(top_builddir)/src/libvirt.la $(top_builddir)/gnulib/lib/libgnu.la \

diff --git a/src/Makefile.am b/src/Makefile.am
index 3ac6dcad16411c99d74a1b5b3b21b0bff3ea1431..d3e8a1b572884b2cf25ce47e72670a54ea344253 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ abs_topsrcdir = $(shell cd $(top_srcdir) && pwd)
 # No libraries with the exception of LIBXML should be listed
 # here. List them against the individual XXX_la_CFLAGS targets
 # that actually use them.
-INCLUDES =     -I../gnulib/lib \
+AM_CPPFLAGS =  -I../gnulib/lib \
                -I$(top_srcdir)/gnulib/lib \
                -I$(top_srcdir) \
                -I../include \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 69dd45728d77c0b12e09dc4c81294476630233e5..f74d8463b655f38613fda435f2fe3115aa2f8d74 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,7 @@ abs_topsrcdir = $(shell cd $(top_srcdir) && pwd)
 
 SHELL = $(PREFERABLY_POSIX_SHELL)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_builddir) -I$(top_srcdir) \
        -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \
        -I$(top_builddir)/include -I$(top_srcdir)/include \
@@ -63,7 +63,7 @@ QEMULIB_LDFLAGS = \
        -rpath /evil/libtool/hack/to/force/shared/lib/creation \
        $(MINGW_EXTRA_LDFLAGS)
 
-INCLUDES += \
+AM_CPPFLAGS += \
        -DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\"
 
 PROBES_O =

diff --git a/tools/Makefile.am b/tools/Makefile.am
index fadd09977e132e089b783bbd5ec8a933ab15e601..613c9a77f07b8991c86ffeb38b4775700d338b20 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,7 +15,7 @@
 ## License along with this library.  If not, see
 ## <http://www.gnu.org/licenses/>.
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_builddir)/include -I$(top_srcdir)/include \
        -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \
        -I$(top_builddir)/src -I$(top_srcdir)/src \