diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 7d70e510..143fc402 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -9,6 +9,7 @@ dist_noinst_DATA = \ compat_getopt_main.c \ README.compat_strlcpy compat_strlcpy.3 +AM_CFLAGS = $(LTLIB_CFLAGS) INCLUDES = -I$(top_srcdir)/src libcompat_la_SOURCES = \ diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c index 90faf75c..9d5458d3 100644 --- a/src/libopensc/reader-ctapi.c +++ b/src/libopensc/reader-ctapi.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "internal.h" #include "ctbcs.h" diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am index 0f95032c..b2b333ad 100644 --- a/src/pkcs11/Makefile.am +++ b/src/pkcs11/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = Makefile.mak dist_noinst_SCRIPTS = opensc_pkcs11_install.js lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la onepin-opensc-pkcs11.la -AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS) $(PTHREAD_CFLAGS) +AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(PTHREAD_CFLAGS) INCLUDES = -I$(top_srcdir)/src OPENSC_PKCS11_INC = sc-pkcs11.h pkcs11.h pkcs11-opensc.h diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am index 62ea8495..f9158eea 100644 --- a/src/pkcs15init/Makefile.am +++ b/src/pkcs15init/Makefile.am @@ -30,7 +30,7 @@ dist_pkgdata_DATA = \ iasecc_generic_pki.profile iasecc_admin_eid.profile iasecc_generic_oberthur.profile AM_CPPFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" -AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS) +AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) INCLUDES = -I$(top_srcdir)/src libpkcs15init_la_SOURCES = \ diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index e3a00f63..93db8fb9 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -11,7 +11,7 @@ bin_PROGRAMS += cryptoflex-tool pkcs15-init netkey-tool piv-tool westcos-tool endif # compile with $(PTHREAD_CFLAGS) to allow debugging with gdb -AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS) $(PTHREAD_CFLAGS) $(LTLIB_CFLAGS) +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