Blob Blame History Raw
diff -up ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 ecryptfs-utils-74/src/libecryptfs/Makefile.am
--- ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139	2009-04-20 11:03:03.000000000 +0200
+++ ecryptfs-utils-74/src/libecryptfs/Makefile.am	2009-04-23 17:03:16.178703120 +0200
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
 
 lib_LTLIBRARIES = libecryptfs.la
 
+noinst_LIBRARIES = libecryptfs.a
+
 pkgconfig_DATA = libecryptfs.pc
 
 libecryptfs_la_SOURCES = \
@@ -20,10 +22,13 @@ libecryptfs_la_SOURCES = \
 	ecryptfs-stat.c \
 	$(top_srcdir)/src/key_mod/ecryptfs_key_mod_passphrase.c
 
+libecryptfs_a_SOURCES = $(libecryptfs_la_SOURCES)
+
 libecryptfs_la_LDFLAGS = \
 	-version-info @LIBECRYPTFS_LT_CURRENT@:@LIBECRYPTFS_LT_REVISION@:@LIBECRYPTFS_LT_AGE@ \
 	-no-undefined
 libecryptfs_la_CFLAGS = $(AM_CFLAGS) $(CRYPTO_CFLAGS) $(KEYUTILS_CFLAGS)
+libecryptfs_a_CFLAGS = $(libecryptfs_la_CFLAGS)
 libecryptfs_la_LIBADD = $(CRYPTO_LIBS) $(KEYUTILS_LIBS)
 
 splint:
diff -up ecryptfs-utils-74/src/utils/Makefile.am.486139 ecryptfs-utils-74/src/utils/Makefile.am
--- ecryptfs-utils-74/src/utils/Makefile.am.486139	2009-04-20 11:03:03.000000000 +0200
+++ ecryptfs-utils-74/src/utils/Makefile.am	2009-04-23 17:12:38.297756365 +0200
@@ -35,12 +35,12 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K
 mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_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.a $(KEYUTILS_LIBS) $(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_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 
 ecryptfs_unwrap_passphrase_SOURCES = ecryptfs_unwrap_passphrase.c
 ecryptfs_unwrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
 ecryptfs_insert_wrapped_passphrase_into_keyring_SOURCES = ecryptfs_insert_wrapped_passphrase_into_keyring.c