Imported Upstream version 2.6.1

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

diff --git a/src/Makemodule.am b/src/Makemodule.am
index ccba17a..57fff40 100644 (file)
--- a/src/Makemodule.am
+++ b/src/Makemodule.am
@@ -6,12 +6,21 @@ cryptsetup_SOURCES =          \
        lib/utils_loop.c        \
        lib/utils_io.c          \
        lib/utils_blkid.c       \
+       src/utils_args.c        \
        src/utils_tools.c       \
        src/utils_password.c    \
-       src/utils_luks2.c       \
+       src/utils_luks.c        \
+       src/utils_luks.h        \
        src/utils_blockdev.c    \
+       src/utils_arg_names.h   \
+       src/utils_arg_macros.h  \
+       src/utils_reencrypt.c   \
+       src/utils_reencrypt_luks1.c     \
+       src/utils_progress.c    \
        src/cryptsetup.c        \
-       src/cryptsetup.h
+       src/cryptsetup.h        \
+       src/cryptsetup_args.h   \
+       src/cryptsetup_arg_list.h
 
 cryptsetup_LDADD = $(LDADD)    \
        libcryptsetup.la        \
@@ -43,16 +52,18 @@ veritysetup_SOURCES =               \
        lib/utils_loop.c        \
        lib/utils_io.c          \
        lib/utils_blkid.c       \
+       src/utils_args.c        \
+       src/utils_arg_names.h   \
+       src/utils_arg_macros.h  \
        src/utils_tools.c       \
-       src/utils_password.c    \
        src/veritysetup.c       \
+       src/veritysetup_args.h  \
+       src/veritysetup_arg_list.h      \
        src/cryptsetup.h
 
 veritysetup_LDADD = $(LDADD)   \
        libcryptsetup.la        \
        @POPT_LIBS@             \
-       @PWQUALITY_LIBS@        \
-       @PASSWDQC_LIBS@         \
        @BLKID_LIBS@
 
 sbin_PROGRAMS += veritysetup
@@ -64,8 +75,7 @@ veritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static
 veritysetup_static_LDADD =     \
        $(veritysetup_LDADD)    \
        @CRYPTO_STATIC_LIBS@    \
-       @DEVMAPPER_STATIC_LIBS@ \
-       @UUID_LIBS@
+       @DEVMAPPER_STATIC_LIBS@
 endif
 endif
 
@@ -77,8 +87,15 @@ integritysetup_SOURCES =     \
        lib/utils_loop.c        \
        lib/utils_io.c          \
        lib/utils_blkid.c       \
+       src/utils_args.c        \
+       src/utils_arg_names.h   \
+       src/utils_arg_macros.h  \
        src/utils_tools.c       \
+       src/utils_blockdev.c    \
+       src/utils_progress.c    \
        src/integritysetup.c    \
+       src/integritysetup_args.h \
+       src/integritysetup_arg_list.h \
        src/cryptsetup.h
 
 integritysetup_LDADD = $(LDADD)        \
@@ -96,41 +113,6 @@ integritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static
 integritysetup_static_LDADD =  \
        $(integritysetup_LDADD) \
        @CRYPTO_STATIC_LIBS@    \
-       @DEVMAPPER_STATIC_LIBS@ \
-       @UUID_LIBS@
-endif
-endif
-
-# reencrypt
-if REENCRYPT
-cryptsetup_reencrypt_SOURCES =         \
-       lib/utils_crypt.c               \
-       lib/utils_io.c                  \
-       lib/utils_blkid.c               \
-       src/utils_tools.c               \
-       lib/utils_loop.c                \
-       src/utils_password.c            \
-       src/cryptsetup_reencrypt.c      \
-       src/cryptsetup.h
-
-cryptsetup_reencrypt_LDADD = $(LDADD)  \
-       libcryptsetup.la                \
-       @POPT_LIBS@                     \
-       @PWQUALITY_LIBS@                \
-       @PASSWDQC_LIBS@                 \
-       @UUID_LIBS@                     \
-       @BLKID_LIBS@
-
-sbin_PROGRAMS += cryptsetup-reencrypt
-
-if STATIC_TOOLS
-sbin_PROGRAMS += cryptsetup-reencrypt.static
-cryptsetup_reencrypt_static_SOURCES = $(cryptsetup_reencrypt_SOURCES)
-cryptsetup_reencrypt_static_LDFLAGS = $(AM_LDFLAGS) -all-static
-cryptsetup_reencrypt_static_LDADD =    \
-       $(cryptsetup_reencrypt_LDADD)   \
-       @CRYPTO_STATIC_LIBS@            \
-       @PWQUALITY_STATIC_LIBS@         \
        @DEVMAPPER_STATIC_LIBS@
 endif
 endif