build: use AM_CPPFLAGS instead of INCLUDES

The latter is marked as deprecated as of automake 1.12.4:

warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c195000..67961fd 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,7 @@ moduledir = $(libdir)/cryptsetup
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcryptsetup.pc
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/lib/crypto_backend      \
        -I$(top_srcdir)/lib/luks1               \

diff --git a/lib/crypto_backend/Makefile.am b/lib/crypto_backend/Makefile.am
index 3c32997..ed3937c 100644 (file)
--- a/lib/crypto_backend/Makefile.am
+++ b/lib/crypto_backend/Makefile.am
@@ -27,4 +27,4 @@ libcrypto_backend_la_SOURCES += crypto_nettle.c
 libcrypto_backend_la_SOURCES += pbkdf2_generic.c
 endif
 
-INCLUDES = -D_GNU_SOURCE -I$(top_srcdir)/lib
+AM_CPPFLAGS = -D_GNU_SOURCE -I$(top_srcdir)/lib

diff --git a/lib/loopaes/Makefile.am b/lib/loopaes/Makefile.am
index db93af0..ededc1a 100644 (file)
--- a/lib/loopaes/Makefile.am
+++ b/lib/loopaes/Makefile.am
@@ -8,7 +8,7 @@ libloopaes_la_SOURCES = \
        loopaes.c \
        loopaes.h
 
-INCLUDES = -D_GNU_SOURCE                       \
+AM_CPPFLAGS = -D_GNU_SOURCE                    \
        -D_LARGEFILE64_SOURCE                   \
        -D_FILE_OFFSET_BITS=64                  \
         -I$(top_srcdir)/lib                    \

diff --git a/lib/luks1/Makefile.am b/lib/luks1/Makefile.am
index bf15200..cc2ecc3 100644 (file)
--- a/lib/luks1/Makefile.am
+++ b/lib/luks1/Makefile.am
@@ -11,7 +11,7 @@ libluks1_la_SOURCES = \
        af.h \
        luks.h
 
-INCLUDES = -D_GNU_SOURCE                       \
+AM_CPPFLAGS = -D_GNU_SOURCE                    \
        -D_LARGEFILE64_SOURCE                   \
        -D_FILE_OFFSET_BITS=64                  \
         -I$(top_srcdir)/lib                    \

diff --git a/lib/tcrypt/Makefile.am b/lib/tcrypt/Makefile.am
index a7c1f7d..03d5ee9 100644 (file)
--- a/lib/tcrypt/Makefile.am
+++ b/lib/tcrypt/Makefile.am
@@ -8,7 +8,7 @@ libtcrypt_la_SOURCES = \
        tcrypt.c \
        tcrypt.h
 
-INCLUDES = -D_GNU_SOURCE                       \
+AM_CPPFLAGS = -D_GNU_SOURCE                    \
        -D_LARGEFILE64_SOURCE                   \
        -D_FILE_OFFSET_BITS=64                  \
         -I$(top_srcdir)/lib                    \

diff --git a/lib/verity/Makefile.am b/lib/verity/Makefile.am
index e229cfb..2225e3c 100644 (file)
--- a/lib/verity/Makefile.am
+++ b/lib/verity/Makefile.am
@@ -9,7 +9,7 @@ libverity_la_SOURCES = \
        verity.c \
        verity.h
 
-INCLUDES = -D_GNU_SOURCE                       \
+AM_CPPFLAGS = -D_GNU_SOURCE                    \
        -D_LARGEFILE64_SOURCE                   \
        -D_FILE_OFFSET_BITS=64                  \
         -I$(top_srcdir)/lib                    \

diff --git a/python/Makefile.am b/python/Makefile.am
index 3bba8e1..199ecc3 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/lib $(PYTHON_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/lib $(PYTHON_INCLUDES)
 EXTRA_DIST = pycryptsetup-test.py
 CLEANFILES = *.img
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 969aa6c..d0d77be 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/lib                     \
        -DDATADIR=\""$(datadir)"\"              \