summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-12-30 11:15:34 -0500
committerMilan Broz <gmazyland@gmail.com>2012-12-30 18:36:46 +0100
commitab080ab5449640d964ef67e51547e08757a7e9d7 (patch)
treef5637605338a99a332b8f62f78672ca925831d24 /lib
parentd1466f23edb190544b44a49e24e61a9907867ca7 (diff)
downloadcryptsetup-ab080ab5449640d964ef67e51547e08757a7e9d7.tar.gz
cryptsetup-ab080ab5449640d964ef67e51547e08757a7e9d7.tar.bz2
cryptsetup-ab080ab5449640d964ef67e51547e08757a7e9d7.zip
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')
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/crypto_backend/Makefile.am2
-rw-r--r--lib/loopaes/Makefile.am2
-rw-r--r--lib/luks1/Makefile.am2
-rw-r--r--lib/tcrypt/Makefile.am2
-rw-r--r--lib/verity/Makefile.am2
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c195000..67961fd 100644
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 \