Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
---
src/common/Makefile.am | 3 +--
src/libopensc/Makefile.am | 1 +
src/libopensc/ctx.c | 1 +
src/libopensc/internal.h | 1 -
src/libopensc/pkcs15-syn.c | 1 +
src/libopensc/pkcs15.c | 1 +
src/libopensc/reader-ctapi.c | 1 +
src/libopensc/reader-pcsc.c | 1 +
src/pkcs11/Makefile.am | 10 +++++++---
src/tests/Makefile.am | 4 +++-
src/tools/Makefile.am | 6 ++++--
11 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index b2e7e15..0b2fe9f 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -17,11 +17,10 @@ libcompat_la_SOURCES = \
compat_strlcpy.h compat_strlcpy.c \
compat_getpass.h compat_getpass.c \
compat_getopt.h compat_getopt.c \
- simclist.c simclist.h libscdl.c
+ simclist.c simclist.h
compat_getopt_main_LDADD = libcompat.la
libpkcs11_la_SOURCES = libpkcs11.c libpkcs11.h
-libpkcs11_la_LIBADD = libscdl.la
libscdl_la_SOURCES = libscdl.c libscdl.h
diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index f50a002..eb1a627 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -53,6 +53,7 @@ libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS)
$(OPTIONAL_OPENCT_LIBS) \
$(OPTIONAL_ZLIB_LIBS) \
$(top_builddir)/src/pkcs15init/libpkcs15init.la \
$(top_builddir)/src/scconf/libscconf.la \
+ $(top_builddir)/src/common/libscdl.la \
$(top_builddir)/src/common/libcompat.la
if WIN32
libopensc_la_LIBADD += -lws2_32
diff --git a/src/libopensc/ctx.c b/src/libopensc/ctx.c
index 92d015b..a62521f 100644
--- a/src/libopensc/ctx.c
+++ b/src/libopensc/ctx.c
@@ -33,6 +33,7 @@
#include <winreg.h>
#endif
+#include "common/libscdl.h"
#include "internal.h"
int _sc_add_reader(sc_context_t *ctx, sc_reader_t *reader)
diff --git a/src/libopensc/internal.h b/src/libopensc/internal.h
index 18e132c..85402ad 100644
--- a/src/libopensc/internal.h
+++ b/src/libopensc/internal.h
@@ -36,7 +36,6 @@ extern "C" {
#endif
#include "common/simclist.h"
-#include "common/libscdl.h"
#include "libopensc/opensc.h"
#include "libopensc/log.h"
#include "libopensc/cards.h"
diff --git a/src/libopensc/pkcs15-syn.c b/src/libopensc/pkcs15-syn.c
index 5c15a35..43e1218 100644
--- a/src/libopensc/pkcs15-syn.c
+++ b/src/libopensc/pkcs15-syn.c
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <assert.h>
+#include "common/libscdl.h"
#include "internal.h"
#include "asn1.h"
#include "pkcs15.h"
diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c
index 96bad57..48ca642 100644
--- a/src/libopensc/pkcs15.c
+++ b/src/libopensc/pkcs15.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <assert.h>
+#include "common/libscdl.h"
#include "cardctl.h"
#include "internal.h"
#include "pkcs15.h"
diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c
index 13948ec..6980b43 100644
--- a/src/libopensc/reader-ctapi.c
+++ b/src/libopensc/reader-ctapi.c
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <string.h>
+#include "common/libscdl.h"
#include "internal.h"
#include "ctbcs.h"
diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c
index ab2f973..e232f48 100644
--- a/src/libopensc/reader-pcsc.c
+++ b/src/libopensc/reader-pcsc.c
@@ -33,6 +33,7 @@
#include <arpa/inet.h>
#endif
+#include "common/libscdl.h"
#include "internal.h"
#include "internal-winscard.h"
diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
index 624c594..d60b323 100644
--- a/src/pkcs11/Makefile.am
+++ b/src/pkcs11/Makefile.am
@@ -15,8 +15,9 @@ OPENSC_PKCS11_SRC = pkcs11-global.c pkcs11-session.c
pkcs11-object.c misc.c slot
framework-pkcs15init.c debug.c opensc-pkcs11.exports \
pkcs11-display.c pkcs11-display.h
OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) \
- $(top_builddir)/src/common/libcompat.la \
- $(top_builddir)/src/libopensc/libopensc.la
+ $(top_builddir)/src/libopensc/libopensc.la \
+ $(top_builddir)/src/common/libscdl.la \
+ $(top_builddir)/src/common/libcompat.la
opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC)
hack-disabled.c
opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
@@ -31,7 +32,10 @@ onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
-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)
$(top_builddir)/src/common/libpkcs11.la
+pkcs11_spy_la_LIBADD = \
+ $(top_builddir)/src/common/libpkcs11.la \
+ $(top_builddir)/src/common/libscdl.la \
+ $(OPTIONAL_OPENSSL_LIBS)
pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
-export-symbols "$(srcdir)/pkcs11-spy.exports" \
-module -shared -avoid-version -no-undefined
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 941e1e3..48ac626 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -7,7 +7,9 @@ SUBDIRS = regression
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
INCLUDES = -I$(top_srcdir)/src
-LIBS = $(top_builddir)/src/libopensc/libopensc.la \
+LIBS = \
+ $(top_builddir)/src/libopensc/libopensc.la \
+ $(top_builddir)/src/common/libscdl.la \
$(top_builddir)/src/common/libcompat.la
COMMON_SRC = sc-test.c
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 6792b93..f2f3229 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -13,8 +13,10 @@ endif
# compile with $(PTHREAD_CFLAGS) to allow debugging with gdb
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
$(PTHREAD_CFLAGS)
INCLUDES = -I$(top_srcdir)/src
-LIBS = $(top_builddir)/src/common/libcompat.la \
- $(top_builddir)/src/libopensc/libopensc.la
+LIBS = \
+ $(top_builddir)/src/libopensc/libopensc.la \
+ $(top_builddir)/src/common/libscdl.la \
+ $(top_builddir)/src/common/libcompat.la
opensc_tool_SOURCES = opensc-tool.c util.c
piv_tool_SOURCES = piv-tool.c util.c
--
1.7.3.4
_______________________________________________
opensc-devel mailing list
opensc-devel@lists.opensc-project.org
http://www.opensc-project.org/mailman/listinfo/opensc-devel
