blob: 7a53da944c9c01a6dbec996bc27828f132b3b922 [file] [log] [blame]
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am.new
index 823cacb..c4ec99b 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am.new
@@ -32,36 +32,36 @@ INCLUDES = -I$(top_srcdir)/src/include
mount_ecryptfs_SOURCES = mount.ecryptfs.c io.c io.h gen_key.c plaintext_decision_graph.c
mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS)
-mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
+mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) $(CRYPTO_LIBS)
umount_ecryptfs_SOURCES = umount.ecryptfs.c
umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS)
-umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS)
ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c
ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS)
-ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
+ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) $(CRYPTO_LIBS)
ecryptfs_wrap_passphrase_SOURCES = ecryptfs_wrap_passphrase.c
-ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS)
ecryptfs_unwrap_passphrase_SOURCES = ecryptfs_unwrap_passphrase.c
-ecryptfs_unwrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ecryptfs_unwrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS)
ecryptfs_insert_wrapped_passphrase_into_keyring_SOURCES = ecryptfs_insert_wrapped_passphrase_into_keyring.c
-ecryptfs_insert_wrapped_passphrase_into_keyring_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ecryptfs_insert_wrapped_passphrase_into_keyring_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS)
ecryptfs_rewrap_passphrase_SOURCES = ecryptfs_rewrap_passphrase.c
-ecryptfs_rewrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ecryptfs_rewrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS)
ecryptfs_add_passphrase_SOURCES = ecryptfs_add_passphrase.c
-ecryptfs_add_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ecryptfs_add_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS)
ecryptfs_generate_tpm_key_SOURCES = ecryptfs_generate_tpm_key.c
ecryptfs_generate_tpm_key_CFLAGS = $(AM_CFLAGS) $(TSPI_CFLAGS)
ecryptfs_generate_tpm_key_LDADD = $(TSPI_LIBS)
mount_ecryptfs_private_SOURCES = mount.ecryptfs_private.c
-mount_ecryptfs_private_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS)
+mount_ecryptfs_private_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS) $(KEYUTILS_LIBS)
ecryptfs_stat_SOURCES = ecryptfs-stat.c
-ecryptfs_stat_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+ecryptfs_stat_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS)
test_SOURCES = test.c io.c
-test_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
+test_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(CRYPTO_LIBS)
install-exec-hook: install-rootsbinPROGRAMS
-rm -f "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am.new
index 92dd426..49747a9 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am.new
@@ -4,4 +4,4 @@ bin_PROGRAMS=ecryptfsd
ecryptfsd_SOURCES = main.c
ecryptfsd_CFLAGS = $(AM_CFLAGS) $(LIBGCRYPT_CFLAGS) $(KEYUTILS_CFLAGS)
-ecryptfsd_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
+ecryptfsd_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) $(CRYPTO_LIBS)