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

Move scdl to it's own subdirectory, although it's merely 

for internal purposes only.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1403 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aet 2003-09-01 08:43:38 +00:00
parent bd54ea7a62
commit bac2b601a9
15 changed files with 90 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -957,6 +957,7 @@ src/pkcs11/rsaref/Makefile
src/pkcs15init/Makefile
src/scam/Makefile
src/scconf/Makefile
src/scdl/Makefile
src/scldap/Makefile
src/scrandom/Makefile
src/sia/Makefile

2
src/Makefile.am
View File

@ -5,5 +5,5 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak
# Order IS important
SUBDIRS = common include scconf scldap scrandom libopensc pkcs15init pkcs11 \
SUBDIRS = common include scconf scdl scldap scrandom libopensc pkcs15init pkcs11 \
tests tools openscd openssh scam pam sia signer usbtoken sslengines

2
src/Makefile.mak
View File

@ -1,5 +1,5 @@
SUBDIRS = include common scconf libopensc tests scrandom pkcs15init pkcs11 tools
SUBDIRS = include common scconf scdl libopensc tests scrandom pkcs15init pkcs11 tools
all::

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

@ -33,5 +33,6 @@ all-local:
@$(LN_S) ${top_srcdir}/src/pkcs15init/pkcs15-init.h pkcs15-init.h
@$(LN_S) ${top_srcdir}/src/pkcs11/pkcs11.h pkcs11.h
@$(LN_S) ${top_srcdir}/src/scconf/scconf.h scconf.h
@$(LN_S) ${top_srcdir}/src/scdl/scdl.h scdl.h
@$(LN_S) ${top_srcdir}/src/scldap/scldap.h scldap.h
@$(LN_S) ${top_srcdir}/src/scrandom/scrandom.h scrandom.h

2
src/libopensc/Makefile.am
View File

@ -35,7 +35,7 @@ libopensc_la_SOURCES = \
card-etoken.c card-tcos.c card-emv.c card-default.c \
card-mcrd.c card-starcos.c
libopensc_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
libopensc_la_LIBADD = @LIBSCCONF@ @LIBDL@ @LIBCRYPTO@ @OPENCT_LIBS@ @LIBPCSC@
libopensc_la_LIBADD = @LIBSCCONF@ ../scdl/libscdl.la @LIBDL@ @LIBCRYPTO@ @OPENCT_LIBS@ @LIBPCSC@
include_HEADERS = \
opensc.h pkcs15.h emv.h \

5
src/libopensc/Makefile.mak
View File

@ -25,7 +25,6 @@ all: install-headers $(TARGET)
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
$(TARGET): $(OBJECTS) ..\scconf\scconf.lib
$(TARGET): $(OBJECTS) ..\scconf\scconf.lib ..\scdl\scdl.lib
perl $(TOPDIR)\win32\makedef.pl $*.def $* $(OBJECTS)
link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\scconf\scconf.lib winscard.lib
link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\scconf\scconf.lib ..\scdl\scdl.lib winscard.lib

2
src/libopensc/module.c
View File

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "../common/scdl.c"
#include <opensc/scdl.h>
int sc_module_open(struct sc_context *ctx, void **mod_handle, const char *filename)
{

2
src/pkcs11/Makefile.am
View File

@ -26,7 +26,7 @@ opensc_pkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \
libpkcs11_la_SOURCES = libpkcs11.c
libpkcs11_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
libpkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \
libpkcs11_la_LIBADD = ../scdl/libscdl.la @LIBDL@ @LIBOPENSC@ \
../pkcs15init/libpkcs15init.la ../scrandom/libscrandom.la
include_HEADERS = pkcs11.h

2
src/pkcs11/Makefile.mak
View File

@ -22,5 +22,5 @@ $(TARGET): $(OBJECTS)
link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\scrandom\scrandom.lib ..\pkcs15init\pkcs15init.lib winscard.lib
$(TARGET2): $(OBJECTS2)
lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2)
lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) ..\scdl\scdl.lib

2
src/pkcs11/libpkcs11.c
View File

@ -12,7 +12,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "../common/scdl.c"
#include <opensc/scdl.h>
#define MAGIC 0xd00bed00

25
src/scdl/.cvsignore Normal file
View File

@ -0,0 +1,25 @@
.deps
.libs
.#*#
.*.bak
.*.orig
.*.rej
.*~
#*#
*.bak
*.d
*.def
*.dll
*.exe
*.la
*.lib
*.lo
*.orig
*.pdb
*.rej
*.u
*~
Makefile
Makefile.in
core
gmon.out

8
src/scdl/Makefile.am Normal file
View File

@ -0,0 +1,8 @@
# Process this file with automake to create Makefile.in
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak
noinst_LTLIBRARIES = libscdl.la
libscdl_la_SOURCES = scdl.c scdl.h

14
src/scdl/Makefile.mak Normal file
View File

@ -0,0 +1,14 @@
TOPDIR = ..\..
HEADERS = scdl.h
HEADERSDIR = $(TOPDIR)\src\include\opensc
TARGET = scdl.lib
OBJECTS = scdl.obj
all: install-headers $(TARGET)
$(TARGET): $(OBJECTS)
lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS) advapi32.lib
!INCLUDE $(TOPDIR)\win32\Make.rules.mak

6
src/scdl/scdl.c
View File

@ -207,7 +207,7 @@ mac_get_address(scdl_context_t *mod, const char *symbol)
}
#endif
static scdl_context_t *
scdl_context_t *
scdl_open(const char *name)
{
scdl_context_t *mod;
@ -240,7 +240,7 @@ scdl_open(const char *name)
return mod;
}
static int
int
scdl_close(scdl_context_t *mod)
{
int rv;
@ -268,7 +268,7 @@ scdl_close(scdl_context_t *mod)
return 0;
}
static void *
void *
scdl_get_address(scdl_context_t *mod, const char *symbol)
{
if (!mod || mod->magic != SCDL_MAGIC)

29
src/scdl/scdl.h Normal file
View File

@ -0,0 +1,29 @@
/*
* Dynamic loading routines for various platforms, to
* be used internally in several places.
*
* No interface for portable error handling, maybe
* later.
*
* Copyright (C) 2003 Antti Tapaninen <aet@cc.hut.fi>
* Olaf Kirch <okir@lst.de>
* Stef Hoeben <stef.hoeben@zetes.com>
*/
#ifndef _SC_RANDOM_H
#define _SC_RANDOM_H
#ifdef __cplusplus
extern "C" {
#endif
typedef void scdl_context_t;
extern scdl_context_t *scdl_open(const char *name);
extern int scdl_close(scdl_context_t *mod);
extern void *scdl_get_address(scdl_context_t *mod, const char *symbol);
#ifdef __cplusplus
}
#endif
#endif