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

remove references to SCIDI 

sanitize pkcs11 include header references
(now they are installed in rsaref/ subdir,
and pkcs11.h is *not* overwritten).

remove automake 1.5 requirement
(automake 1.4 on debian stable/woody works fine)


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1064 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aj 2003-04-22 17:02:28 +00:00
parent 131719b8c6
commit c0ea6e9554
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -10,5 +10,3 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 acinclude.m4 \
install-sh ltmain.sh missing mkinstalldirs ylwrap \
compile config.log config.status depcomp
# require automake 1.5
AUTOMAKE_OPTIONS = 1.5

3
src/pkcs11/Makefile.am
View File

@ -28,8 +28,7 @@ libpkcs11_la_SOURCES = libpkcs11.c
libpkcs11_la_LIBADD = $(LIBDL)
libpkcs11_la_LDFLAGS = -version-info 0:6:0
include_HEADERS = pkcs11.h rsaref/pkcs11.h rsaref/pkcs11f.h rsaref/pkcs11t.h
noinst_HEADERS = rsaref/unix.h rsaref/win32.h
include_HEADERS = pkcs11.h
jar-dir:
if test ! -d jar-dir ; then mkdir jar-dir ; fi

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

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

5
src/scam/Makefile.am
View File

@ -13,10 +13,9 @@ if HAVE_SSL
SSL_LIB = @LIBCRYPTO@
endif
LDFLAGS = @LIBOPENSC@ @LIBSCRANDOM@ $(LDAP_LIB) $(SSL_LIB) $(SCIDI_LIB)
EXTRAINC = $(SCIDI_INC)
LDFLAGS = @LIBOPENSC@ @LIBSCRANDOM@ $(LDAP_LIB) $(SSL_LIB)
SRC = scam.c scam.h p15_eid.c p15_ldap.c $(SCIDI_SRC)
SRC = scam.c scam.h p15_eid.c p15_ldap.c
libscam_la_SOURCES = $(SRC)
libscam_la_LDFLAGS = -module -avoid-version