build: use AM_CPPFLAGS instead of INCLUDES

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 60e740d..d0d77be 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/lib                     \
        -DDATADIR=\""$(datadir)"\"              \
@@ -14,13 +14,16 @@ cryptsetup_SOURCES = \
        $(top_builddir)/lib/utils_crypt.c       \
        $(top_builddir)/lib/utils_loop.c        \
        $(top_builddir)/lib/utils_fips.c        \
+       utils_tools.c                           \
+       utils_password.c                        \
        cryptsetup.c                            \
        cryptsetup.h
 
 cryptsetup_LDADD = \
        $(top_builddir)/lib/libcryptsetup.la    \
        @POPT_LIBS@                             \
-       @FIPSCHECK_LIBS@
+       @FIPSCHECK_LIBS@                        \
+       @PWQUALITY_LIBS@
 
 cryptsetup_CFLAGS = -Wall
 
@@ -33,6 +36,7 @@ cryptsetup_static_CFLAGS = $(cryptsetup_CFLAGS)
 cryptsetup_static_LDFLAGS = -all-static
 cryptsetup_static_LDADD = $(cryptsetup_LDADD)  \
        @CRYPTO_STATIC_LIBS@                    \
+       @PWQUALITY_STATIC_LIBS@                 \
        @DEVMAPPER_STATIC_LIBS@                 \
        @UUID_LIBS@
 endif
@@ -43,6 +47,7 @@ if VERITYSETUP
 veritysetup_SOURCES = \
        $(top_builddir)/lib/utils_crypt.c       \
        $(top_builddir)/lib/utils_loop.c        \
+       utils_tools.c                           \
        veritysetup.c                           \
        cryptsetup.h
 
@@ -70,6 +75,7 @@ endif
 if REENCRYPT
 cryptsetup_reencrypt_SOURCES = \
        $(top_builddir)/lib/utils_crypt.c       \
+       utils_tools.c                           \
        cryptsetup_reencrypt.c                  \
        cryptsetup.h