giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- build fixes from Andreas

Browse Source 
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@991 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
okir 2003-04-11 11:46:02 +00:00
parent a89ab6477c
commit 87a0cc51a1
12 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openscd/Makefile.am
View File

@ -3,7 +3,7 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @CFLAGS_OPENSC@
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
AM_LDFLAGS = @LDFLAGS@ @LIBOPENSC@
bin_PROGRAMS = openscd

2
src/pam/Makefile.am
View File

@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I${top_srcdir}/src/scam
LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ ${top_builddir}/src/scam/libscam.la
AM_LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ ${top_builddir}/src/scam/libscam.la
SRC = pam_opensc.c pam_support.c pam_support.h

2
src/pkcs11/Makefile.am
View File

@ -8,7 +8,7 @@ SUBDIRS = . rsaref
INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBOPENSC@ ../pkcs15init/libpkcs15init.la \
AM_LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBOPENSC@ ../pkcs15init/libpkcs15init.la \
../scrandom/libscrandom.a
SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \

2
src/pkcs15init/Makefile.am
View File

@ -5,7 +5,7 @@ includedir = ${prefix}/include/opensc
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
AM_LDFLAGS = @LDFLAGS@ @LIBOPENSC@
EXTRA_DIST = flex.profile gpk.profile miocos.profile etoken.profile \
pkcs15.profile

10
src/pkcs15init/pkcs15-cflex.c
View File

@ -388,9 +388,9 @@ err:
}
struct sc_pkcs15init_operations sc_pkcs15init_cflex_operations = {
cflex_erase_card,
cflex_init_app,
cflex_new_pin,
cflex_new_key,
cflex_new_file,
.erase_card = cflex_erase_card,
.init_app = cflex_init_app,
.new_pin = cflex_new_pin,
.new_key = cflex_new_key,
.new_file = cflex_new_file,
};

12
src/pkcs15init/pkcs15-etoken.c
View File

@ -690,10 +690,10 @@ error(struct sc_profile *profile, const char *fmt, ...)
}
struct sc_pkcs15init_operations sc_pkcs15init_etoken_operations = {
etoken_erase,
etoken_init_app,
etoken_new_pin,
etoken_new_key,
etoken_new_file,
etoken_generate_key
.erase_card = etoken_erase,
.init_app = etoken_init_app,
.new_pin = etoken_new_pin,
.new_key = etoken_new_key,
.new_file = etoken_new_file,
.generate_key = etoken_generate_key
};

10
src/pkcs15init/pkcs15-gpk.c
View File

@ -978,9 +978,9 @@ debug(struct sc_profile *profile, const char *fmt, ...)
}
struct sc_pkcs15init_operations sc_pkcs15init_gpk_operations = {
gpk_erase_card,
gpk_init_app,
gpk_new_pin,
gpk_new_key,
gpk_new_file,
.erase_card = gpk_erase_card,
.init_app = gpk_init_app,
.new_pin = gpk_new_pin,
.new_key = gpk_new_key,
.new_file = gpk_new_file,
};

9
src/pkcs15init/pkcs15-miocos.c
View File

@ -199,9 +199,8 @@ miocos_new_key(struct sc_profile *profile, struct sc_card *card,
}
struct sc_pkcs15init_operations sc_pkcs15init_miocos_operations = {
NULL,
miocos_init_app,
miocos_new_pin,
miocos_new_key,
miocos_new_file,
.init_app = miocos_init_app,
.new_pin = miocos_new_pin,
.new_key = miocos_new_key,
.new_file = miocos_new_file,
};

12
src/scam/Makefile.am
View File

@ -13,13 +13,13 @@ if HAVE_SSL
SSL_LIB = @LIBCRYPTO@
endif
# Temporary
if HAVE_SCIDI
SCIDI_LIB = @LIBSSP@
SCIDI_SRC = ../../../scam/sp.c
SCIDI_INC = @CFLAGS_SSP@
endif
# if HAVE_SCIDI
# SCIDI_LIB = @LIBSSP@
# SCIDI_SRC = ../../../scam/sp.c
# SCIDI_INC = @CFLAGS_SSP@
# endif
LDFLAGS = @LIBOPENSC@ @LIBSCRANDOM@ $(LDAP_LIB) $(SSL_LIB) $(SCIDI_LIB)
AM_LDFLAGS = @LIBOPENSC@ @LIBSCRANDOM@ $(LDAP_LIB) $(SSL_LIB) $(SCIDI_LIB)
EXTRAINC = $(SCIDI_INC)
SRC = scam.c scam.h p15_eid.c p15_ldap.c $(SCIDI_SRC)

2
src/sia/Makefile.am
View File

@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I../scam
LDFLAGS = @LDFLAGS@ @LIBDL@ ../scam/libscam.la
AM_LDFLAGS = @LDFLAGS@ @LIBDL@ ../scam/libscam.la
SRC = sia_opensc.c sia_support.c sia_support.h

2
src/tests/Makefile.am
View File

@ -3,7 +3,7 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @CFLAGS_OPENSC@
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
AM_LDFLAGS = @LDFLAGS@ @LIBOPENSC@
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest

2
src/tools/Makefile.am
View File

@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak
INCLUDES = @CFLAGS_OPENSC@
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
AM_LDFLAGS = @LDFLAGS@ @LIBOPENSC@
if HAVE_SSL
PROGRAMS_SSL = cryptoflex-tool pkcs15-init