Imported upstream version 1.6.7

[platform/upstream/cryptsetup.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d816b78..6662568 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,38 +1,39 @@
-SUBDIRS = crypto_backend luks1 loopaes
+SUBDIRS = crypto_backend luks1 loopaes verity tcrypt
 
 moduledir = $(libdir)/cryptsetup
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcryptsetup.pc
 
-INCLUDES = \
+AM_CPPFLAGS = -include config.h \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/lib/crypto_backend      \
        -I$(top_srcdir)/lib/luks1               \
        -I$(top_srcdir)/lib/loopaes             \
+       -I$(top_srcdir)/lib/verity              \
+       -I$(top_srcdir)/lib/tcrypt              \
        -DDATADIR=\""$(datadir)"\"              \
        -DLIBDIR=\""$(libdir)"\"                \
        -DPREFIX=\""$(prefix)"\"                \
        -DSYSCONFDIR=\""$(sysconfdir)"\"        \
-       -DVERSION=\""$(VERSION)"\"              \
-       -D_GNU_SOURCE                           \
-       -D_LARGEFILE64_SOURCE                   \
-       -D_FILE_OFFSET_BITS=64
+       -DVERSION=\""$(VERSION)"\"
 
 lib_LTLIBRARIES = libcryptsetup.la
 
 common_ldadd = \
        crypto_backend/libcrypto_backend.la     \
        luks1/libluks1.la                       \
-       loopaes/libloopaes.la
+       loopaes/libloopaes.la                   \
+       verity/libverity.la                     \
+       tcrypt/libtcrypt.la
 
 libcryptsetup_la_DEPENDENCIES = $(common_ldadd) libcryptsetup.sym
 
-libcryptsetup_la_LDFLAGS = \
+libcryptsetup_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined \
        -Wl,--version-script=$(top_srcdir)/lib/libcryptsetup.sym \
        -version-info @LIBCRYPTSETUP_VERSION_INFO@
 
-libcryptsetup_la_CFLAGS = -Wall @CRYPTO_CFLAGS@
+libcryptsetup_la_CFLAGS = -Wall $(AM_CFLAGS) @CRYPTO_CFLAGS@
 
 libcryptsetup_la_LIBADD = \
        @UUID_LIBS@                             \
@@ -44,16 +45,20 @@ libcryptsetup_la_LIBADD = \
 libcryptsetup_la_SOURCES = \
        setup.c                                 \
        internal.h                              \
+       bitops.h                                \
        nls.h                                   \
        libcryptsetup.h                         \
        utils.c                                 \
+       utils_benchmark.c                       \
        utils_crypt.c                           \
        utils_crypt.h                           \
-       utils_debug.c                           \
        utils_loop.c                            \
        utils_loop.h                            \
        utils_devpath.c                         \
        utils_wipe.c                            \
+       utils_fips.c                            \
+       utils_fips.h                            \
+       utils_device.c                          \
        libdevmapper.c                          \
        utils_dm.h                              \
        volumekey.c                             \