Hello Michael,
This is a cleanup for libtool statements.
It looks like if you define --module -avoid-version it does what you want... :)
Alon.
---
diff --git a/src/key_mod/Makefile.am b/src/key_mod/Makefile.am
index 50e3674..c282d38 100644
--- a/src/key_mod/Makefile.am
+++ b/src/key_mod/Makefile.am
@@ -14,31 +14,32 @@ ecryptfskeymod_LTLIBRARIES+=libecryptfs_key_mod_gpg.la
endif
libecryptfs_key_mod_openssl_la_SOURCES = ecryptfs_key_mod_openssl.c
-libecryptfs_key_mod_openssl_la_LDFLAGS = $(OPENSSL_LIBS)
libecryptfs_key_mod_openssl_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS)
+libecryptfs_key_mod_openssl_la_LIBADD = $(OPENSSL_LIBS)
+libecryptfs_key_mod_openssl_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
libecryptfs_key_mod_pkcs11_helper_la_SOURCES = ecryptfs_key_mod_pkcs11_helper.c
libecryptfs_key_mod_pkcs11_helper_la_CFLAGS = $(AM_CFLAGS)
$(PKCS11_HELPER_CFLAGS) $(OPENSSL_CFLAGS)
libecryptfs_key_mod_pkcs11_helper_la_LIBADD = $(PKCS11_HELPER_LIBS)
$(OPENSSL_LIBS)
+libecryptfs_key_mod_pkcs11_helper_la_LDFLAGS = $(AM_LDFLAGS) -module
-avoid-version
libecryptfs_key_mod_tspi_la_SOURCES = ecryptfs_key_mod_tspi.c
libecryptfs_key_mod_tspi_la_CFLAGS = $(AM_CFLAGS) $(TSPI_CFLAGS)
libecryptfs_key_mod_tspi_la_LIBADD = $(TSPI_LIBS)
+libecryptfs_key_mod_tspi_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
libecryptfs_key_mod_gpg_la_SOURCES = ecryptfs_key_mod_gpg.c
libecryptfs_key_mod_gpg_la_CFLAGS = $(AM_CFLAGS) $(GPGME_CFLAGS)
libecryptfs_key_mod_gpg_la_LIBADD = $(GPGME_LIBS)
+libecryptfs_key_mod_gpg_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
libecryptfs_key_mod_passphrase_la_SOURCES = ecryptfs_key_mod_passphrase.c
libecryptfs_key_mod_passphrase_la_CFLAGS = $(AM_CFLAGS) $(LIBGCRYPT_CFLAGS)
libecryptfs_key_mod_passphrase_la_LIBADD = $(LIBGCRYPT_LIBS)
+libecryptfs_key_mod_passphrase_la_LDFLAGS = $(AM_LDFLAGS) -module
-avoid-version
install-data-hook:
for f in `echo "$(ecryptfskeymod_LTLIBRARIES)" | $(SED) 's/\.la//g'`;
do \
- rm -fr \
- "$(DESTDIR)$(ecryptfskeymoddir)/$$f.la" \
- "$(DESTDIR)$(ecryptfskeymoddir)/$$f.a" \
- "$(DESTDIR)$(ecryptfskeymoddir)/$$f.so" \
- "$(DESTDIR)$(ecryptfskeymoddir)/$$f.so.0"; \
- mv -f "$(DESTDIR)$(ecryptfskeymoddir)/$$f.so.0.0.0"
"$(DESTDIR)$(ecryptfskeymoddir)/$$f.so" ; \
+ rm -f "$(DESTDIR)$(ecryptfskeymoddir)/$$f.la"; \
+ rm -f "$(DESTDIR)$(ecryptfskeymoddir)/$$f.a"; \
done
diff --git a/src/pam_ecryptfs/Makefile.am b/src/pam_ecryptfs/Makefile.am
index 0540c5a..7216ea8 100644
--- a/src/pam_ecryptfs/Makefile.am
+++ b/src/pam_ecryptfs/Makefile.am
@@ -2,17 +2,11 @@ if BUILD_PAM
pam_LTLIBRARIES = libpam_ecryptfs.la
install-data-hook:
- mv -f "$(DESTDIR)$(pamdir)/libpam_ecryptfs.so.0.0.0"
"$(DESTDIR)$(pamdir)/pam_ecryptfs.so"
- rm -fr \
- "$(DESTDIR)$(pamdir)/libpam_ecryptfs.so.0" \
- "$(DESTDIR)$(pamdir)/libpam_ecryptfs.so" \
- "$(DESTDIR)$(pamdir)/libpam_ecryptfs.la" \
- "$(DESTDIR)$(pamdir)/libpam_ecryptfs.a"
+ rm -f "$(DESTDIR)$(pamdir)/libpam_ecryptfs.la"
+ rm -f "$(DESTDIR)$(pamdir)/libpam_ecryptfs.a"
endif
-# force libtool to install us
-libdir=$(pamlibdir)
-
libpam_ecryptfs_la_SOURCES = pam_ecryptfs.c
libpam_ecryptfs_la_CFLAGS = $(AM_CFLAGS) $(LIBGCRYPT_CFLAGS)
libpam_ecryptfs_la_LIBADD = $(top_srcdir)/src/libecryptfs/libecryptfs.la
$(PAM_LIBS) $(LIBGCRYPT_LIBS)
+libpam_ecryptfs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
eCryptfs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ecryptfs-devel
