Imported Upstream version 2.6.1

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

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 69159fa..2e60a90 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -1,11 +1,11 @@
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lib/libcryptsetup.pc
+pkgconfig_DATA += lib/libcryptsetup.pc
 
-lib_LTLIBRARIES = libcryptsetup.la
+lib_LTLIBRARIES += libcryptsetup.la
 
 noinst_LTLIBRARIES += libutils_io.la
 
-include_HEADERS = lib/libcryptsetup.h
+include_HEADERS += lib/libcryptsetup.h
 
 EXTRA_DIST += lib/libcryptsetup.pc.in lib/libcryptsetup.sym
 
@@ -15,15 +15,7 @@ libutils_io_la_SOURCES = \
        lib/utils_io.c                  \
        lib/utils_io.h
 
-libcryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS) \
-       -I $(top_srcdir)/lib/crypto_backend     \
-       -I $(top_srcdir)/lib/luks1              \
-       -I $(top_srcdir)/lib/luks2              \
-       -I $(top_srcdir)/lib/loopaes            \
-       -I $(top_srcdir)/lib/verity             \
-       -I $(top_srcdir)/lib/tcrypt             \
-       -I $(top_srcdir)/lib/integrity          \
-       -I $(top_srcdir)/lib/bitlk
+libcryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libcryptsetup_la_DEPENDENCIES = libutils_io.la libcrypto_backend.la lib/libcryptsetup.sym
 
@@ -40,7 +32,8 @@ libcryptsetup_la_LIBADD = \
        @LIBARGON2_LIBS@        \
        @JSON_C_LIBS@           \
        @BLKID_LIBS@            \
-       $(LTLIBICONV)           \
+       @DL_LIBS@               \
+       $(LTLIBINTL)            \
        libcrypto_backend.la    \
        libutils_io.la
 
@@ -50,6 +43,8 @@ libcryptsetup_la_SOURCES = \
        lib/bitops.h                    \
        lib/nls.h                       \
        lib/libcryptsetup.h             \
+       lib/libcryptsetup_macros.h      \
+       lib/libcryptsetup_symver.h      \
        lib/utils.c                     \
        lib/utils_benchmark.c           \
        lib/utils_crypt.c               \
@@ -58,8 +53,6 @@ libcryptsetup_la_SOURCES = \
        lib/utils_loop.h                \
        lib/utils_devpath.c             \
        lib/utils_wipe.c                \
-       lib/utils_fips.c                \
-       lib/utils_fips.h                \
        lib/utils_device.c              \
        lib/utils_keyring.c             \
        lib/utils_keyring.h             \
@@ -74,14 +67,14 @@ libcryptsetup_la_SOURCES = \
        lib/volumekey.c                 \
        lib/random.c                    \
        lib/crypt_plain.c               \
-       lib/base64.h                    \
-       lib/base64.c                    \
        lib/integrity/integrity.h       \
        lib/integrity/integrity.c       \
        lib/loopaes/loopaes.h           \
        lib/loopaes/loopaes.c           \
        lib/tcrypt/tcrypt.h             \
        lib/tcrypt/tcrypt.c             \
+       lib/keyslot_context.h           \
+       lib/keyslot_context.c           \
        lib/luks1/af.h                  \
        lib/luks1/af.c                  \
        lib/luks1/keyencryption.c       \
@@ -113,4 +106,6 @@ libcryptsetup_la_SOURCES = \
        lib/utils_blkid.c               \
        lib/utils_blkid.h               \
        lib/bitlk/bitlk.h               \
-       lib/bitlk/bitlk.c
+       lib/bitlk/bitlk.c               \
+       lib/fvault2/fvault2.h           \
+       lib/fvault2/fvault2.c