Amend r5201: also move libltdl build properties to the right Makefile and other leftovers.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5203 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
c6eb3a3085
commit
2ea78bf741
|
@ -9,6 +9,7 @@ dist_noinst_DATA = \
|
||||||
compat_getopt_main.c \
|
compat_getopt_main.c \
|
||||||
README.compat_strlcpy compat_strlcpy.3
|
README.compat_strlcpy compat_strlcpy.3
|
||||||
|
|
||||||
|
AM_CFLAGS = $(LTLIB_CFLAGS)
|
||||||
INCLUDES = -I$(top_srcdir)/src
|
INCLUDES = -I$(top_srcdir)/src
|
||||||
|
|
||||||
libcompat_la_SOURCES = \
|
libcompat_la_SOURCES = \
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ltdl.h>
|
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "ctbcs.h"
|
#include "ctbcs.h"
|
||||||
|
|
|
@ -6,7 +6,7 @@ EXTRA_DIST = Makefile.mak
|
||||||
dist_noinst_SCRIPTS = opensc_pkcs11_install.js
|
dist_noinst_SCRIPTS = opensc_pkcs11_install.js
|
||||||
lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la onepin-opensc-pkcs11.la
|
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
|
INCLUDES = -I$(top_srcdir)/src
|
||||||
|
|
||||||
OPENSC_PKCS11_INC = sc-pkcs11.h pkcs11.h pkcs11-opensc.h
|
OPENSC_PKCS11_INC = sc-pkcs11.h pkcs11.h pkcs11-opensc.h
|
||||||
|
|
|
@ -30,7 +30,7 @@ dist_pkgdata_DATA = \
|
||||||
iasecc_generic_pki.profile iasecc_admin_eid.profile iasecc_generic_oberthur.profile
|
iasecc_generic_pki.profile iasecc_admin_eid.profile iasecc_generic_oberthur.profile
|
||||||
|
|
||||||
AM_CPPFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
|
AM_CPPFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
|
||||||
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS)
|
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS)
|
||||||
INCLUDES = -I$(top_srcdir)/src
|
INCLUDES = -I$(top_srcdir)/src
|
||||||
|
|
||||||
libpkcs15init_la_SOURCES = \
|
libpkcs15init_la_SOURCES = \
|
||||||
|
|
|
@ -11,7 +11,7 @@ bin_PROGRAMS += cryptoflex-tool pkcs15-init netkey-tool piv-tool westcos-tool
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# compile with $(PTHREAD_CFLAGS) to allow debugging with gdb
|
# 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
|
INCLUDES = -I$(top_srcdir)/src
|
||||||
LIBS = $(top_builddir)/src/common/libcompat.la \
|
LIBS = $(top_builddir)/src/common/libcompat.la \
|
||||||
$(top_builddir)/src/libopensc/libopensc.la
|
$(top_builddir)/src/libopensc/libopensc.la
|
||||||
|
|
Loading…
Reference in New Issue