- applied build fixes from Andreas
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1058 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
686a78e34e
commit
0aea6fcba5
|
@ -1,8 +1,9 @@
|
||||||
## Makefile.am -- Process this file with automake to produce Makefile.in
|
## Makefile.am -- Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
SUBDIRS = . aclocal docs etc src
|
SUBDIRS = . aclocal docs etc src win32
|
||||||
|
|
||||||
EXTRA_DIST = CodingStyle README.signer bootstrap
|
EXTRA_DIST = CodingStyle README.cards README.signer README.Win32 \
|
||||||
|
bootstrap depcomp Makefile.mak
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 acinclude.m4 \
|
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 acinclude.m4 \
|
||||||
config.guess config.h.in config.sub configure \
|
config.guess config.h.in config.sub configure \
|
||||||
|
|
|
@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
|
||||||
AC_PREREQ(2.52)
|
AC_PREREQ(2.52)
|
||||||
|
|
||||||
AC_INIT(src/libopensc/sc.c)
|
AC_INIT(src/libopensc/sc.c)
|
||||||
AM_INIT_AUTOMAKE(opensc, CVS)
|
AM_INIT_AUTOMAKE(opensc, 0.8.0-rc1)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
@ -1150,6 +1150,7 @@ src/sslengine/Makefile
|
||||||
src/tests/Makefile
|
src/tests/Makefile
|
||||||
src/tools/Makefile
|
src/tools/Makefile
|
||||||
src/usbtoken/Makefile
|
src/usbtoken/Makefile
|
||||||
|
win32/Makefile
|
||||||
])
|
])
|
||||||
|
|
||||||
if test ! -z "$RANDOM_POOL" ; then
|
if test ! -z "$RANDOM_POOL" ; then
|
||||||
|
|
|
@ -26,7 +26,7 @@ man_MANS = pkcs15-crypt.1 \
|
||||||
sc_release_context.3 \
|
sc_release_context.3 \
|
||||||
sc_select_file.3
|
sc_select_file.3
|
||||||
EXTRA_DIST = $(man_MANS) pkcs15-profile.5.in pkcs-15v1_1.asn \
|
EXTRA_DIST = $(man_MANS) pkcs15-profile.5.in pkcs-15v1_1.asn \
|
||||||
usbtoken.xml usbtoken.html
|
usbtoken.xml usbtoken.html doxygen.conf
|
||||||
|
|
||||||
STYLESHEET=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/docbook.xsl
|
STYLESHEET=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/docbook.xsl
|
||||||
|
|
||||||
|
|
|
@ -5,4 +5,6 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
EXTRA_DIST = Makefile.mak
|
EXTRA_DIST = Makefile.mak
|
||||||
|
|
||||||
# Order IS important
|
# Order IS important
|
||||||
SUBDIRS = common include scconf scldap scrandom assuan libopensc pkcs15init pkcs11 tests tools openssh scam pam sia signer usbtoken sslengine
|
SUBDIRS = common include scconf scldap scrandom assuan libopensc \
|
||||||
|
pkcs15init pkcs11 tests tools openssh scam pam sia signer \
|
||||||
|
usbtoken sslengine
|
||||||
|
|
|
@ -2,4 +2,6 @@
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
EXTRA_DIST = Makefile.mak winconfig.h
|
||||||
|
|
||||||
SUBDIRS = . opensc
|
SUBDIRS = . opensc
|
||||||
|
|
|
@ -5,7 +5,7 @@ includedir = ${prefix}/include/opensc
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
EXTRA_DIST = Makefile.mak libopensc.pc.in \
|
EXTRA_DIST = Makefile.mak libopensc.pc.in \
|
||||||
reader-pcsc.c reader-openct.c reader-usbtoken.c
|
reader-pcsc.c reader-openct.c reader-usbtoken.c emv.c
|
||||||
|
|
||||||
if HAVE_SSL
|
if HAVE_SSL
|
||||||
SSL_LIB = @LIBCRYPTO@
|
SSL_LIB = @LIBCRYPTO@
|
||||||
|
|
|
@ -2,10 +2,12 @@
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
EXTRA_DIST = test.c
|
||||||
|
|
||||||
INCLUDES = @CFLAGS_OPENSC@
|
INCLUDES = @CFLAGS_OPENSC@
|
||||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
||||||
|
|
||||||
noinst_PROGRAMS = openscd
|
noinst_PROGRAMS = openscd
|
||||||
|
|
||||||
openscd_SOURCES = openscd.c commands.c mkdtemp.c
|
openscd_SOURCES = openscd.c commands.c mkdtemp.c openscd.h
|
||||||
openscd_LDADD = @GETOPTSRC@ ../assuan/libassuan.a ../scrandom/libscrandom.a
|
openscd_LDADD = @GETOPTSRC@ ../assuan/libassuan.a ../scrandom/libscrandom.a
|
||||||
|
|
|
@ -7,8 +7,9 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <assuan.h>
|
#include "../assuan/assuan.h"
|
||||||
#include "../libopensc/opensc.h"
|
#include "../libopensc/opensc.h"
|
||||||
#include "../libopensc/pkcs15.h"
|
#include "../libopensc/pkcs15.h"
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
|
@ -4,6 +4,8 @@ libdir = @libdir@/pkcs11
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
EXTRA_DIST = Makefile.mak opensc_pkcs11_install.js
|
||||||
|
|
||||||
SUBDIRS = . rsaref
|
SUBDIRS = . rsaref
|
||||||
|
|
||||||
INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
|
INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
|
||||||
|
|
|
@ -8,7 +8,7 @@ INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
|
||||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
||||||
|
|
||||||
EXTRA_DIST = flex.profile gpk.profile miocos.profile etoken.profile \
|
EXTRA_DIST = flex.profile gpk.profile miocos.profile etoken.profile \
|
||||||
pkcs15.profile
|
pkcs15.profile Makefile.mak
|
||||||
|
|
||||||
lib_LTLIBRARIES = libpkcs15init.la
|
lib_LTLIBRARIES = libpkcs15init.la
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ includedir = ${prefix}/include/opensc
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in lex-parse.c
|
MAINTAINERCLEANFILES = Makefile.in lex-parse.c
|
||||||
|
|
||||||
EXTRA_DIST = Makefile.am
|
EXTRA_DIST = Makefile.mak
|
||||||
|
|
||||||
include_HEADERS = scconf.h
|
include_HEADERS = scconf.h
|
||||||
noinst_HEADERS = internal.h
|
noinst_HEADERS = internal.h
|
||||||
|
|
|
@ -4,6 +4,8 @@ includedir = ${prefix}/include/opensc
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
EXTRA_DIST = Makefile.mak
|
||||||
|
|
||||||
include_HEADERS = scrandom.h
|
include_HEADERS = scrandom.h
|
||||||
|
|
||||||
if HAVE_SSL
|
if HAVE_SSL
|
||||||
|
|
|
@ -2,6 +2,10 @@
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
EXTRA_DIST = Makefile.mak regression/README regression/crypt0001 \
|
||||||
|
regression/crypt0002 regression/crypt0003 regression/crypt0004 \
|
||||||
|
regression/functions
|
||||||
|
|
||||||
INCLUDES = @CFLAGS_OPENSC@
|
INCLUDES = @CFLAGS_OPENSC@
|
||||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue