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

Minor cleanups 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1309 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aet 2003-07-28 12:11:03 +00:00
parent 3ed1b9dfc7
commit a327d1994a
20 changed files with 162 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.am
View File

@ -1,12 +1,15 @@
# Process this file with automake to create Makefile.in
SUBDIRS = . aclocal docs etc src win32 SUBDIRS = . aclocal docs etc src win32
EXTRA_DIST = CodingStyle bootstrap Makefile.mak depcomp EXTRA_DIST = CodingStyle bootstrap Makefile.mak depcomp
MAINTAINERCLEANFILES = Makefile.in config.h.in configure \ MAINTAINERCLEANFILES = \
install-sh ltmain.sh missing mkinstalldirs \ Makefile.in config.h.in configure \
compile depcomp config.log config.status \ install-sh ltmain.sh missing mkinstalldirs \
config.guess config.sub acinclude.m4 aclocal.m4 compile depcomp config.log config.status \
config.guess config.sub acinclude.m4 aclocal.m4
DEPCLEANFILES = config.log configure DEPCLEANFILES = config.log configure
AUTOMAKE_OPTIONS=foreign AUTOMAKE_OPTIONS = foreign

56
docs/Makefile.am
View File

@ -1,40 +1,42 @@
# Process this file with automake to create Makefile.in # Process this file with automake to create Makefile.in
XSLTPROC := @XSLTPROC@ XSLTPROC = @XSLTPROC@
HTMLFILES := usbtoken.html opensc.html opensc.css HTMLFILES = usbtoken.html opensc.html opensc.css
XMLFILES := usbtoken.xml opensc.xml opensc.xsl XMLFILES = usbtoken.xml opensc.xml opensc.xsl
MAINTAINERCLEANFILES = Makefile.in pkcs15-profile.5 MAINTAINERCLEANFILES = Makefile.in pkcs15-profile.5
MANSRC = pkcs15-crypt.1 \ MANSRC = \
pkcs15-init.1 \ pkcs15-crypt.1 \
cryptoflex-tool.1 \ pkcs15-init.1 \
opensc-config.1 \ cryptoflex-tool.1 \
opensc-explorer.1 \ opensc-config.1 \
opensc-tool.1 \ opensc-explorer.1 \
pkcs15-tool.1 \ opensc-tool.1 \
opensc.7 \ pkcs15-tool.1 \
pkcs15.7 \ opensc.7 \
sc_connect_card.3 \ pkcs15.7 \
sc_detect_card_presence.3 \ sc_connect_card.3 \
sc_disconnect_card.3 \ sc_detect_card_presence.3 \
sc_establish_context.3 \ sc_disconnect_card.3 \
sc_file.3 \ sc_establish_context.3 \
sc_file_free.3 \ sc_file.3 \
sc_file_new.3 \ sc_file_free.3 \
sc_list_files.3 \ sc_file_new.3 \
sc_lock.3 \ sc_list_files.3 \
sc_read_binary.3 \ sc_lock.3 \
sc_read_record.3 \ sc_read_binary.3 \
sc_release_context.3 \ sc_read_record.3 \
sc_select_file.3 \ sc_release_context.3 \
sc_pkcs15_compute_signature.3 sc_select_file.3 \
sc_pkcs15_compute_signature.3
man_MANS = $(MANSRC) pkcs15-profile.5 man_MANS = $(MANSRC) pkcs15-profile.5
noinst_DATA = $(HTMLFILES) noinst_DATA = $(HTMLFILES)
EXTRA_DIST = $(MANSRC) pkcs15-profile.5.in pkcs-15v1_1.asn \ EXTRA_DIST = $(MANSRC) pkcs15-profile.5.in pkcs-15v1_1.asn \
$(XMLFILES) $(HTMLFILES) doxygen.conf $(XMLFILES) $(HTMLFILES) doxygen.conf
STYLESHEET=opensc.xsl STYLESHEET = opensc.xsl
%.html: %.xml %.html: %.xml
if HAVE_DOCBOOK if HAVE_DOCBOOK

2
etc/Makefile.am
View File

@ -3,4 +3,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = opensc.conf.example scldap.conf.example EXTRA_DIST = opensc.conf.example scldap.conf.example
pkgdata_DATA = opensc.conf.example scldap.conf.example pkgdata_DATA = $(EXTRA_DIST)

30
src/include/opensc/Makefile.am
View File

@ -2,22 +2,23 @@
RM = rm -f RM = rm -f
SUBDIRS = rsaref SUBDIRS = . rsaref
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
DISTCLEANFILES= asn1.h \ DISTCLEANFILES = \
cardctl.h \ asn1.h \
emv.h \ cardctl.h \
log.h \ emv.h \
opensc.h \ log.h \
errors.h \ opensc.h \
types.h \ errors.h \
pkcs11.h \ types.h \
pkcs15.h \ pkcs11.h \
pkcs15-init.h \ pkcs15.h \
scconf.h \ pkcs15-init.h \
scldap.h \ scconf.h \
scrandom.h scldap.h \
scrandom.h
all-local: all-local:
@$(RM) *.h @$(RM) *.h
@ -34,4 +35,3 @@ all-local:
@$(LN_S) ${top_srcdir}/src/scconf/scconf.h scconf.h @$(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/scldap/scldap.h scldap.h
@$(LN_S) ${top_srcdir}/src/scrandom/scrandom.h scrandom.h @$(LN_S) ${top_srcdir}/src/scrandom/scrandom.h scrandom.h

11
src/include/opensc/rsaref/Makefile.am
View File

@ -3,11 +3,12 @@
RM = rm -f RM = rm -f
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
DISTCLEANFILES= pkcs11.h \ DISTCLEANFILES = \
pkcs11f.h \ pkcs11.h \
pkcs11t.h \ pkcs11f.h \
unix.h \ pkcs11t.h \
win32.h unix.h \
win32.h
all-local: all-local:
@$(RM) *.h @$(RM) *.h

13
src/libopensc/Makefile.am
View File

@ -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 includedir = ${prefix}/include/opensc
@ -26,11 +26,13 @@ OPENCT_SRC = reader-openct.c
endif endif
INCLUDES = $(PCSC_FLAGS) @OPENCT_CFLAGS@ INCLUDES = $(PCSC_FLAGS) @OPENCT_CFLAGS@
LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
bin_SCRIPTS = opensc-config bin_SCRIPTS = opensc-config
lib_LTLIBRARIES = libopensc.la 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 \ errors.c sec.c card.c iso7816.c dir.c \
portability.c padding.c \ portability.c padding.c \
pkcs15.c pkcs15-cert.c pkcs15-data.c pkcs15-pin.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-etoken.c card-tcos.c card-emv.c card-default.c \
card-mcrd.c card-starcos.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) 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 \ errors.h types.h \
cardctl.h asn1.h log.h cardctl.h asn1.h log.h
noinst_HEADERS = ctbcs.h internal.h noinst_HEADERS = ctbcs.h internal.h
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libopensc.pc pkgconfig_DATA = libopensc.pc

2
src/openssh/Makefile.am
View File

@ -2,4 +2,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST= openssh-3.6.1p2.diff openssh-3.6.1p2.README EXTRA_DIST = openssh-3.6.1p2.diff openssh-3.6.1p2.README

12
src/pkcs11/Makefile.am
View File

@ -10,11 +10,9 @@ SUBDIRS = . rsaref
INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \ SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \
mechanism.c openssl.c \ mechanism.c openssl.c secretkey.c framework-pkcs15.c \
secretkey.c framework-pkcs15.c framework-pkcs15init.c \ framework-pkcs15init.c debug.c
debug.c
INC = sc-pkcs11.h INC = sc-pkcs11.h
lib_LTLIBRARIES = opensc-pkcs11.la libpkcs11.la 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_SOURCES = $(SRC) $(INC)
opensc_pkcs11_la_LDFLAGS = -module -avoid-version opensc_pkcs11_la_LDFLAGS = -module -avoid-version
opensc_pkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \ opensc_pkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \
../pkcs15init/libpkcs15init.la \ ../pkcs15init/libpkcs15init.la ../scrandom/libscrandom.la
../scrandom/libscrandom.la
libpkcs11_la_SOURCES = libpkcs11.c libpkcs11_la_SOURCES = libpkcs11.c
libpkcs11_la_LDFLAGS = -version-info 0:6:0 libpkcs11_la_LDFLAGS = -version-info 0:6:0
libpkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \ libpkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \
../pkcs15init/libpkcs15init.la \ ../pkcs15init/libpkcs15init.la ../scrandom/libscrandom.la
../scrandom/libscrandom.la
openscdir=@includedir@/opensc openscdir=@includedir@/opensc
opensc_HEADERS = pkcs11.h opensc_HEADERS = pkcs11.h

4
src/pkcs11/rsaref/Makefile.am
View File

@ -2,9 +2,7 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
includedir= @includedir@/opensc/rsaref includedir = @includedir@/opensc/rsaref
include_HEADERS = pkcs11.h pkcs11f.h pkcs11t.h include_HEADERS = pkcs11.h pkcs11f.h pkcs11t.h
noinst_HEADERS = unix.h win32.h noinst_HEADERS = unix.h win32.h

11
src/pkcs15init/Makefile.am
View File

@ -7,8 +7,15 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
LDFLAGS = @LDFLAGS@ @LIBOPENSC@ LDFLAGS = @LDFLAGS@ @LIBOPENSC@
PROFILES = flex.profile flex_so.profile flex_onepin.profile gpk.profile \ PROFILES = \
miocos.profile etoken.profile pkcs15.profile flex.profile \
flex_so.profile \
flex_onepin.profile \
gpk.profile \
miocos.profile \
etoken.profile \
pkcs15.profile
EXTRA_DIST = $(PROFILES) Makefile.mak EXTRA_DIST = $(PROFILES) Makefile.mak
lib_LTLIBRARIES = libpkcs15init.la lib_LTLIBRARIES = libpkcs15init.la

4
src/scam/Makefile.am
View File

@ -2,7 +2,7 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@ INCLUDES = @CFLAGS_OPENSC@
lib_LTLIBRARIES = libscam.la lib_LTLIBRARIES = libscam.la
@ -13,11 +13,9 @@ if HAVE_SSL
SSL_LIB = @LIBCRYPTO@ SSL_LIB = @LIBCRYPTO@
endif endif
SRC = scam.c scam.h p15_eid.c p15_ldap.c SRC = scam.c scam.h p15_eid.c p15_ldap.c
libscam_la_SOURCES = $(SRC) libscam_la_SOURCES = $(SRC)
libscam_la_LDFLAGS = -module -avoid-version libscam_la_LDFLAGS = -module -avoid-version
libscam_la_LIBADD = @LIBOPENSC@ $(LDAP_LIB) $(SSL_LIB) \ libscam_la_LIBADD = @LIBOPENSC@ $(LDAP_LIB) $(SSL_LIB) \
../scrandom/libscrandom.la ../scrandom/libscrandom.la
libscam_la_CFLAGS = $(EXTRAINC)

2
src/scrandom/Makefile.am
View File

@ -11,7 +11,7 @@ SSL_LIB = @LIBCRYPTO@
endif endif
noinst_LTLIBRARIES = libscrandom.la noinst_LTLIBRARIES = libscrandom.la
libscrandom_la_SOURCES=scrandom.c scrandom.h libscrandom_la_SOURCES = scrandom.c scrandom.h
noinst_PROGRAMS = test-random noinst_PROGRAMS = test-random

12
src/signer/Makefile.am
View File

@ -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) plugindir = $(PLUGINDIR)
openscdir = @libdir@/opensc openscdir = @libdir@/opensc
@ -20,12 +20,10 @@ endif
opensc_signer_la_LDFLAGS = -module -avoid-version opensc_signer_la_LDFLAGS = -module -avoid-version
opensc_signer_la_LIBADD = @LIBOPENSC@ @LIBCRYPTO@ @LIBASSUAN@ opensc_signer_la_LIBADD = @LIBOPENSC@ @LIBCRYPTO@ @LIBASSUAN@
opensc_signer_la_CFLAGS = $(AM_CFLAGS) -Inpinclude -DXP_UNIX opensc_signer_la_CFLAGS = $(AM_CFLAGS) -Inpinclude -DXP_UNIX
opensc_signer_la_SOURCES = opensc-crypto.c opensc-support.c \ opensc_signer_la_SOURCES = \
signer.c stubs.c dialog.c opensc-crypto.c opensc-support.c signer.c stubs.c dialog.c
noinst_HEADERS = opensc-crypto.h opensc-support.h \ noinst_HEADERS = \
signer.h npinclude/jri.h npinclude/jri_md.h \ opensc-crypto.h opensc-support.h signer.h
npinclude/jritypes.h npinclude/npapi.h \
npinclude/npupp.h npinclude/npunix.c
install-exec-local: install-openscLTLIBRARIES install-exec-local: install-openscLTLIBRARIES
-$(LN_S) -f $(openscdir)/opensc-signer.so $(DESTDIR)$(plugindir)/ -$(LN_S) -f $(openscdir)/opensc-signer.so $(DESTDIR)$(plugindir)/

2
src/signer/npinclude/Makefile.am
View File

@ -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 MAINTAINERCLEANFILES = Makefile.in

20
src/sslengines/Makefile.am
View File

@ -1,23 +1,31 @@
# Process this file with automake to create Makefile.in
libdir = @libdir@/opensc libdir = @libdir@/opensc
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak engine_pkcs11.def $(engine_pkcs11_la_SOURCES) \ EXTRA_DIST = Makefile.mak engine_pkcs11.def test_engine.sh \
$(engine_opensc_la_SOURCES) test_engine.sh $(engine_opensc_la_SOURCES) $(engine_pkcs11_la_SOURCES)
if HAVE_ENGINE if HAVE_ENGINE
lib_LTLIBRARIES=engine_opensc.la engine_pkcs11.la lib_LTLIBRARIES = engine_opensc.la engine_pkcs11.la
endif 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_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_LIBADD = @LIBCRYPTOA@ @LIBOPENSC@
engine_opensc_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version 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_attr.c p11_cert.c p11_err.c p11_key.c \
p11_load.c p11_misc.c p11_rsa.c p11_slot.c \ p11_load.c p11_misc.c p11_rsa.c p11_slot.c \
pkcs11-internal.h libpkcs11.h 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_LIBADD = @LIBCRYPTOA@ ../pkcs11/libpkcs11.la
engine_pkcs11_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version engine_pkcs11_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version

2
src/tests/Makefile.am
View File

@ -2,7 +2,7 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
SUBDIRS=regression SUBDIRS = . regression
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak

12
src/tests/regression/Makefile.am
View File

@ -1,7 +1,9 @@
# Process this file with automake to create Makefile.in
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST= crypt0001 crypt0002 crypt0003 crypt0004 erase \ EXTRA_DIST = \
functions init0001 init0002 init0003 init0004 init0005 \ crypt0001 crypt0002 crypt0003 crypt0004 \
init0006 init0007 init0008 init0009 init0010 init0011 \ init0001 init0002 init0003 init0004 init0005 init0006 \
README run-all test.p12 init0007 init0008 init0009 init0010 init0011 \
erase functions README run-all test.p12

7
src/usbtoken/Makefile.am
View File

@ -1,11 +1,12 @@
# Process this file with automake to create Makefile.in # Process this file with automake to create Makefile.in
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST=DEPRECATED EXTRA_DIST = DEPRECATED
if HAVE_USBTOKEN if HAVE_USBTOKEN
sbin_PROGRAMS = usbtoken sbin_PROGRAMS = usbtoken
endif endif
usbtoken_SOURCES= atr.c eutron.c etoken.c ikey2k.c ikey3k.c main.c pid.c \ usbtoken_SOURCES = atr.c eutron.c etoken.c ikey2k.c ikey3k.c main.c pid.c \
socket.c t1.c usb.c usbtoken.h socket.c t1.c usb.c usbtoken.h
#usbtoken_CFLAGS= -DUSB_DEBUG #usbtoken_CFLAGS = -DUSB_DEBUG

2
win32/Makefile.am
View File

@ -1,3 +1,5 @@
# Process this file with automake to create Makefile.in
EXTRA_DIST = Make.rules.mak makedef.pl EXTRA_DIST = Make.rules.mak makedef.pl
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in