Minor cleanups
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1309 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
3ed1b9dfc7
commit
a327d1994a
@ -1,8 +1,11 @@
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
SUBDIRS = . aclocal docs etc src win32
|
||||
|
||||
EXTRA_DIST = CodingStyle bootstrap Makefile.mak depcomp
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in config.h.in configure \
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in config.h.in configure \
|
||||
install-sh ltmain.sh missing mkinstalldirs \
|
||||
compile depcomp config.log config.status \
|
||||
config.guess config.sub acinclude.m4 aclocal.m4
|
||||
|
@ -1,12 +1,13 @@
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
XSLTPROC := @XSLTPROC@
|
||||
HTMLFILES := usbtoken.html opensc.html opensc.css
|
||||
XMLFILES := usbtoken.xml opensc.xml opensc.xsl
|
||||
XSLTPROC = @XSLTPROC@
|
||||
HTMLFILES = usbtoken.html opensc.html opensc.css
|
||||
XMLFILES = usbtoken.xml opensc.xml opensc.xsl
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in pkcs15-profile.5
|
||||
|
||||
MANSRC = pkcs15-crypt.1 \
|
||||
MANSRC = \
|
||||
pkcs15-crypt.1 \
|
||||
pkcs15-init.1 \
|
||||
cryptoflex-tool.1 \
|
||||
opensc-config.1 \
|
||||
@ -29,6 +30,7 @@ MANSRC = pkcs15-crypt.1 \
|
||||
sc_release_context.3 \
|
||||
sc_select_file.3 \
|
||||
sc_pkcs15_compute_signature.3
|
||||
|
||||
man_MANS = $(MANSRC) pkcs15-profile.5
|
||||
noinst_DATA = $(HTMLFILES)
|
||||
EXTRA_DIST = $(MANSRC) pkcs15-profile.5.in pkcs-15v1_1.asn \
|
||||
|
@ -3,4 +3,4 @@
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EXTRA_DIST = opensc.conf.example scldap.conf.example
|
||||
pkgdata_DATA = opensc.conf.example scldap.conf.example
|
||||
pkgdata_DATA = $(EXTRA_DIST)
|
||||
|
@ -2,10 +2,11 @@
|
||||
|
||||
RM = rm -f
|
||||
|
||||
SUBDIRS = rsaref
|
||||
SUBDIRS = . rsaref
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
DISTCLEANFILES= asn1.h \
|
||||
DISTCLEANFILES = \
|
||||
asn1.h \
|
||||
cardctl.h \
|
||||
emv.h \
|
||||
log.h \
|
||||
@ -34,4 +35,3 @@ all-local:
|
||||
@$(LN_S) ${top_srcdir}/src/scconf/scconf.h scconf.h
|
||||
@$(LN_S) ${top_srcdir}/src/scldap/scldap.h scldap.h
|
||||
@$(LN_S) ${top_srcdir}/src/scrandom/scrandom.h scrandom.h
|
||||
|
||||
|
@ -3,7 +3,8 @@
|
||||
RM = rm -f
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
DISTCLEANFILES= pkcs11.h \
|
||||
DISTCLEANFILES = \
|
||||
pkcs11.h \
|
||||
pkcs11f.h \
|
||||
pkcs11t.h \
|
||||
unix.h \
|
||||
|
@ -1,4 +1,4 @@
|
||||
## Makefile.am -- Process this file with automake to produce Makefile.in
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
includedir = ${prefix}/include/opensc
|
||||
|
||||
@ -26,11 +26,13 @@ OPENCT_SRC = reader-openct.c
|
||||
endif
|
||||
|
||||
INCLUDES = $(PCSC_FLAGS) @OPENCT_CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
|
||||
|
||||
bin_SCRIPTS = opensc-config
|
||||
|
||||
lib_LTLIBRARIES = libopensc.la
|
||||
libopensc_la_SOURCES = sc.c ctx.c module.c asn1.c log.c base64.c \
|
||||
libopensc_la_SOURCES = \
|
||||
sc.c ctx.c module.c asn1.c log.c base64.c \
|
||||
errors.c sec.c card.c iso7816.c dir.c \
|
||||
portability.c padding.c \
|
||||
pkcs15.c pkcs15-cert.c pkcs15-data.c pkcs15-pin.c \
|
||||
@ -42,14 +44,15 @@ libopensc_la_SOURCES = sc.c ctx.c module.c asn1.c log.c base64.c \
|
||||
card-etoken.c card-tcos.c card-emv.c card-default.c \
|
||||
card-mcrd.c card-starcos.c
|
||||
|
||||
libopensc_la_LDFLAGS = -version-info 0:6:0 @OPENCT_LDFLAGS@
|
||||
libopensc_la_LDFLAGS = -version-info 0:6:0
|
||||
libopensc_la_LIBADD = @LIBDL@ @OPENCT_LIBS@ $(PCSC_LIB) $(SSL_LIB) $(LIBSCCONF)
|
||||
|
||||
include_HEADERS = opensc.h pkcs15.h emv.h \
|
||||
include_HEADERS = \
|
||||
opensc.h pkcs15.h emv.h \
|
||||
errors.h types.h \
|
||||
cardctl.h asn1.h log.h
|
||||
|
||||
noinst_HEADERS = ctbcs.h internal.h
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libopensc.pc
|
||||
|
||||
|
@ -10,11 +10,9 @@ SUBDIRS = . rsaref
|
||||
|
||||
INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
|
||||
|
||||
|
||||
SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \
|
||||
mechanism.c openssl.c \
|
||||
secretkey.c framework-pkcs15.c framework-pkcs15init.c \
|
||||
debug.c
|
||||
mechanism.c openssl.c secretkey.c framework-pkcs15.c \
|
||||
framework-pkcs15init.c debug.c
|
||||
INC = sc-pkcs11.h
|
||||
|
||||
lib_LTLIBRARIES = opensc-pkcs11.la libpkcs11.la
|
||||
@ -22,14 +20,12 @@ lib_LTLIBRARIES = opensc-pkcs11.la libpkcs11.la
|
||||
opensc_pkcs11_la_SOURCES = $(SRC) $(INC)
|
||||
opensc_pkcs11_la_LDFLAGS = -module -avoid-version
|
||||
opensc_pkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \
|
||||
../pkcs15init/libpkcs15init.la \
|
||||
../scrandom/libscrandom.la
|
||||
../pkcs15init/libpkcs15init.la ../scrandom/libscrandom.la
|
||||
|
||||
libpkcs11_la_SOURCES = libpkcs11.c
|
||||
libpkcs11_la_LDFLAGS = -version-info 0:6:0
|
||||
libpkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \
|
||||
../pkcs15init/libpkcs15init.la \
|
||||
../scrandom/libscrandom.la
|
||||
../pkcs15init/libpkcs15init.la ../scrandom/libscrandom.la
|
||||
|
||||
openscdir=@includedir@/opensc
|
||||
opensc_HEADERS = pkcs11.h
|
||||
|
@ -6,5 +6,3 @@ includedir= @includedir@/opensc/rsaref
|
||||
|
||||
include_HEADERS = pkcs11.h pkcs11f.h pkcs11t.h
|
||||
noinst_HEADERS = unix.h win32.h
|
||||
|
||||
|
||||
|
@ -7,8 +7,15 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||
INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
|
||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
||||
|
||||
PROFILES = flex.profile flex_so.profile flex_onepin.profile gpk.profile \
|
||||
miocos.profile etoken.profile pkcs15.profile
|
||||
PROFILES = \
|
||||
flex.profile \
|
||||
flex_so.profile \
|
||||
flex_onepin.profile \
|
||||
gpk.profile \
|
||||
miocos.profile \
|
||||
etoken.profile \
|
||||
pkcs15.profile
|
||||
|
||||
EXTRA_DIST = $(PROFILES) Makefile.mak
|
||||
|
||||
lib_LTLIBRARIES = libpkcs15init.la
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
|
||||
INCLUDES = @CFLAGS_OPENSC@
|
||||
|
||||
lib_LTLIBRARIES = libscam.la
|
||||
|
||||
@ -13,11 +13,9 @@ if HAVE_SSL
|
||||
SSL_LIB = @LIBCRYPTO@
|
||||
endif
|
||||
|
||||
|
||||
SRC = scam.c scam.h p15_eid.c p15_ldap.c
|
||||
|
||||
libscam_la_SOURCES = $(SRC)
|
||||
libscam_la_LDFLAGS = -module -avoid-version
|
||||
libscam_la_LIBADD = @LIBOPENSC@ $(LDAP_LIB) $(SSL_LIB) \
|
||||
../scrandom/libscrandom.la
|
||||
libscam_la_CFLAGS = $(EXTRAINC)
|
||||
|
@ -1,4 +1,4 @@
|
||||
## Makefile.am -- Process this file with automake to produce Makefile.in
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
plugindir = $(PLUGINDIR)
|
||||
openscdir = @libdir@/opensc
|
||||
@ -20,12 +20,10 @@ endif
|
||||
opensc_signer_la_LDFLAGS = -module -avoid-version
|
||||
opensc_signer_la_LIBADD = @LIBOPENSC@ @LIBCRYPTO@ @LIBASSUAN@
|
||||
opensc_signer_la_CFLAGS = $(AM_CFLAGS) -Inpinclude -DXP_UNIX
|
||||
opensc_signer_la_SOURCES = opensc-crypto.c opensc-support.c \
|
||||
signer.c stubs.c dialog.c
|
||||
noinst_HEADERS = opensc-crypto.h opensc-support.h \
|
||||
signer.h npinclude/jri.h npinclude/jri_md.h \
|
||||
npinclude/jritypes.h npinclude/npapi.h \
|
||||
npinclude/npupp.h npinclude/npunix.c
|
||||
opensc_signer_la_SOURCES = \
|
||||
opensc-crypto.c opensc-support.c signer.c stubs.c dialog.c
|
||||
noinst_HEADERS = \
|
||||
opensc-crypto.h opensc-support.h signer.h
|
||||
|
||||
install-exec-local: install-openscLTLIBRARIES
|
||||
-$(LN_S) -f $(openscdir)/opensc-signer.so $(DESTDIR)$(plugindir)/
|
||||
|
@ -1,4 +1,4 @@
|
||||
## Makefile.am -- Process this file with automake to produce Makefile.in
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
|
@ -1,23 +1,31 @@
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
libdir = @libdir@/opensc
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EXTRA_DIST = Makefile.mak engine_pkcs11.def $(engine_pkcs11_la_SOURCES) \
|
||||
$(engine_opensc_la_SOURCES) test_engine.sh
|
||||
EXTRA_DIST = Makefile.mak engine_pkcs11.def test_engine.sh \
|
||||
$(engine_opensc_la_SOURCES) $(engine_pkcs11_la_SOURCES)
|
||||
|
||||
if HAVE_ENGINE
|
||||
lib_LTLIBRARIES = engine_opensc.la engine_pkcs11.la
|
||||
endif
|
||||
|
||||
OPENSSL_CFLAGS = \
|
||||
-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H \
|
||||
-DOPENSSL_NO_KRB5 -DL_ENDIAN -DTERMIO -DENGINE_DYNAMIC_SUPPORT \
|
||||
-DSHA1_ASM -DMD5_ASM -DRMD160_ASM
|
||||
|
||||
engine_opensc_la_SOURCES = hw_opensc.c engine_opensc.c engine_opensc.h
|
||||
engine_opensc_la_CFLAGS = -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DL_ENDIAN -DTERMIO -DENGINE_DYNAMIC_SUPPORT -DSHA1_ASM -DMD5_ASM -DRMD160_ASM @CFLAGS_OPENSC@
|
||||
engine_opensc_la_CFLAGS = $(OPENSSL_CFLAGS) @CFLAGS_OPENSC@
|
||||
engine_opensc_la_LIBADD = @LIBCRYPTOA@ @LIBOPENSC@
|
||||
engine_opensc_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version
|
||||
|
||||
engine_pkcs11_la_SOURCES = hw_pkcs11.c engine_pkcs11.c engine_pkcs11.h \
|
||||
engine_pkcs11_la_SOURCES = \
|
||||
hw_pkcs11.c engine_pkcs11.c engine_pkcs11.h \
|
||||
p11_attr.c p11_cert.c p11_err.c p11_key.c \
|
||||
p11_load.c p11_misc.c p11_rsa.c p11_slot.c \
|
||||
pkcs11-internal.h libpkcs11.h
|
||||
engine_pkcs11_la_CFLAGS = -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DL_ENDIAN -DTERMIO -DENGINE_DYNAMIC_SUPPORT -DSHA1_ASM -DMD5_ASM -DRMD160_ASM @CFLAGS_OPENSC@
|
||||
engine_pkcs11_la_CFLAGS = $(OPENSSL_CFLAGS) @CFLAGS_OPENSC@
|
||||
engine_pkcs11_la_LIBADD = @LIBCRYPTOA@ ../pkcs11/libpkcs11.la
|
||||
engine_pkcs11_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
SUBDIRS=regression
|
||||
SUBDIRS = . regression
|
||||
|
||||
EXTRA_DIST = Makefile.mak
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EXTRA_DIST= crypt0001 crypt0002 crypt0003 crypt0004 erase \
|
||||
functions init0001 init0002 init0003 init0004 init0005 \
|
||||
init0006 init0007 init0008 init0009 init0010 init0011 \
|
||||
README run-all test.p12
|
||||
|
||||
EXTRA_DIST = \
|
||||
crypt0001 crypt0002 crypt0003 crypt0004 \
|
||||
init0001 init0002 init0003 init0004 init0005 init0006 \
|
||||
init0007 init0008 init0009 init0010 init0011 \
|
||||
erase functions README run-all test.p12
|
||||
|
@ -1,4 +1,5 @@
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
EXTRA_DIST = DEPRECATED
|
||||
|
||||
|
@ -1,3 +1,5 @@
|
||||
# Process this file with automake to create Makefile.in
|
||||
|
||||
EXTRA_DIST = Make.rules.mak makedef.pl
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
Loading…
Reference in New Issue
Block a user