[pkg-opensc-commit] [libp11] 24/33: Include libp11 objects in pkcs11 engine library

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit dd42a0d4228e58eabd5af57d28d6b9118033f0cb
Author: Matt Hauck <matthauck at gmail.com>
Date:   Thu Sep 1 00:49:09 2016 -0700

    Include libp11 objects in pkcs11 engine library
    
    This enables pkcs11 engine to be statically linked against
    OpenSSL without breaking thread-safety by eliminating a dll boundary
    between pkcs11 engine and libp11 implementation.
---
 src/Makefile.am  | 2 +-
 src/Makefile.mak | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index eb91f56..c39266b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ else
 dist_noinst_DATA += pkcs11.rc
 endif
 pkcs11_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_EXTRA_CFLAGS) $(OPENSSL_CFLAGS)
-pkcs11_la_LIBADD = libp11.la $(OPENSSL_LIBS)
+pkcs11_la_LIBADD = $(libp11_la_OBJECTS) $(OPENSSL_LIBS)
 pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT) \
 	-avoid-version -export-symbols "$(srcdir)/pkcs11.exports"
 
diff --git a/src/Makefile.mak b/src/Makefile.mak
index 7f23509..d26a2c6 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -34,9 +34,9 @@ $(LIBP11_TARGET): $(LIBP11_OBJECTS) $*.def $*.res
 		$(LIBP11_OBJECTS) $(LIBS) $*.res
 	if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2
 
-$(PKCS11_TARGET): $(PKCS11_OBJECTS) $(LIBP11_LIB) $*.def $*.res
+$(PKCS11_TARGET): $(PKCS11_OBJECTS) $(LIBP11_OBJECTS) $*.def $*.res
 	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$@ \
-		$(PKCS11_OBJECTS) $(LIBP11_LIB) $(LIBS) $*.res
+		$(PKCS11_OBJECTS) $(LIBP11_OBJECTS) $(LIBS) $*.res
 	if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2
 
 .SUFFIXES: .exports

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git