| --- src/pkcs11/Makefile.am 2011-05-17 13:07:00.000000000 -0400 |
| +++ Makefile.am.new 2011-07-07 10:03:28.399185928 -0400 |
| @@ -14,9 +14,10 @@ |
| mechanism.c openssl.c framework-pkcs15.c \ |
| framework-pkcs15init.c debug.c opensc-pkcs11.exports \ |
| pkcs11-display.c pkcs11-display.h |
| -OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS) \ |
| +OPENSC_PKCS11_LIBS = \ |
| $(top_builddir)/src/common/libcompat.la \ |
| - $(top_builddir)/src/libopensc/libopensc.la |
| + $(top_builddir)/src/libopensc/libopensc.la \ |
| + $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS) |
| |
| opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-disabled.c |
| opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS) |
| @@ -31,7 +32,7 @@ |
| -module -shared -avoid-version -no-undefined |
| |
| pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports |
| -pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) $(top_builddir)/src/common/libpkcs11.la |
| +pkcs11_spy_la_LIBADD = $(top_builddir)/src/common/libpkcs11.la $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) |
| pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \ |
| -export-symbols "$(srcdir)/pkcs11-spy.exports" \ |
| -module -shared -avoid-version -no-undefined |
| --- src/tools/Makefile.am 2011-05-17 13:07:00.000000000 -0400 |
| +++ Makefile.am.new 2011-07-07 10:06:08.710185925 -0400 |
| @@ -24,8 +24,9 @@ |
| pkcs15_tool_SOURCES = pkcs15-tool.c util.c |
| pkcs15_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) |
| pkcs11_tool_SOURCES = pkcs11-tool.c util.c |
| -pkcs11_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \ |
| - $(top_builddir)/src/common/libpkcs11.la |
| +pkcs11_tool_LDADD = \ |
| + $(top_builddir)/src/common/libpkcs11.la \ |
| + $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) |
| pkcs15_crypt_SOURCES = pkcs15-crypt.c util.c |
| pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_LIBS) |
| cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c |
