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')
This commit is contained in:
Dave Reisner
2012-12-30 11:15:34 -05:00
committed by Milan Broz
parent d1466f23ed
commit ab080ab544
8 changed files with 8 additions and 8 deletions

View File

@@ -5,7 +5,7 @@ moduledir = $(libdir)/cryptsetup
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcryptsetup.pc pkgconfig_DATA = libcryptsetup.pc
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/lib/crypto_backend \ -I$(top_srcdir)/lib/crypto_backend \
-I$(top_srcdir)/lib/luks1 \ -I$(top_srcdir)/lib/luks1 \

View File

@@ -27,4 +27,4 @@ libcrypto_backend_la_SOURCES += crypto_nettle.c
libcrypto_backend_la_SOURCES += pbkdf2_generic.c libcrypto_backend_la_SOURCES += pbkdf2_generic.c
endif endif
INCLUDES = -D_GNU_SOURCE -I$(top_srcdir)/lib AM_CPPFLAGS = -D_GNU_SOURCE -I$(top_srcdir)/lib

View File

@@ -8,7 +8,7 @@ libloopaes_la_SOURCES = \
loopaes.c \ loopaes.c \
loopaes.h loopaes.h
INCLUDES = -D_GNU_SOURCE \ AM_CPPFLAGS = -D_GNU_SOURCE \
-D_LARGEFILE64_SOURCE \ -D_LARGEFILE64_SOURCE \
-D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \

View File

@@ -11,7 +11,7 @@ libluks1_la_SOURCES = \
af.h \ af.h \
luks.h luks.h
INCLUDES = -D_GNU_SOURCE \ AM_CPPFLAGS = -D_GNU_SOURCE \
-D_LARGEFILE64_SOURCE \ -D_LARGEFILE64_SOURCE \
-D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \

View File

@@ -8,7 +8,7 @@ libtcrypt_la_SOURCES = \
tcrypt.c \ tcrypt.c \
tcrypt.h tcrypt.h
INCLUDES = -D_GNU_SOURCE \ AM_CPPFLAGS = -D_GNU_SOURCE \
-D_LARGEFILE64_SOURCE \ -D_LARGEFILE64_SOURCE \
-D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \

View File

@@ -9,7 +9,7 @@ libverity_la_SOURCES = \
verity.c \ verity.c \
verity.h verity.h
INCLUDES = -D_GNU_SOURCE \ AM_CPPFLAGS = -D_GNU_SOURCE \
-D_LARGEFILE64_SOURCE \ -D_LARGEFILE64_SOURCE \
-D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \

View File

@@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/lib $(PYTHON_INCLUDES) AM_CPPFLAGS = -I$(top_srcdir)/lib $(PYTHON_INCLUDES)
EXTRA_DIST = pycryptsetup-test.py EXTRA_DIST = pycryptsetup-test.py
CLEANFILES = *.img CLEANFILES = *.img

View File

@@ -1,4 +1,4 @@
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \