From bac2b601a95ffa4c3dde883aa204c591b5332500 Mon Sep 17 00:00:00 2001 From: aet Date: Mon, 1 Sep 2003 08:43:38 +0000 Subject: [PATCH] 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 --- configure.in | 1 + src/Makefile.am | 2 +- src/Makefile.mak | 2 +- src/include/opensc/Makefile.am | 1 + src/libopensc/Makefile.am | 2 +- src/libopensc/Makefile.mak | 5 ++--- src/libopensc/module.c | 2 +- src/pkcs11/Makefile.am | 2 +- src/pkcs11/Makefile.mak | 2 +- src/pkcs11/libpkcs11.c | 2 +- src/scdl/.cvsignore | 25 +++++++++++++++++++++++++ src/scdl/Makefile.am | 8 ++++++++ src/scdl/Makefile.mak | 14 ++++++++++++++ src/scdl/scdl.c | 6 +++--- src/scdl/scdl.h | 29 +++++++++++++++++++++++++++++ 15 files changed, 90 insertions(+), 13 deletions(-) create mode 100644 src/scdl/.cvsignore create mode 100644 src/scdl/Makefile.am create mode 100644 src/scdl/Makefile.mak create mode 100644 src/scdl/scdl.h diff --git a/configure.in b/configure.in index 5437a589..cb8749bc 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 5ef42c6c..092c8db5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/Makefile.mak b/src/Makefile.mak index 6467eca1..223a3437 100644 --- a/src/Makefile.mak +++ b/src/Makefile.mak @@ -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:: diff --git a/src/include/opensc/Makefile.am b/src/include/opensc/Makefile.am index 9648cb4f..a9cbff70 100644 --- a/src/include/opensc/Makefile.am +++ b/src/include/opensc/Makefile.am @@ -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 diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am index 1691936e..a1b4fc91 100644 --- a/src/libopensc/Makefile.am +++ b/src/libopensc/Makefile.am @@ -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 \ diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak index 0923b454..5c280a51 100644 --- a/src/libopensc/Makefile.mak +++ b/src/libopensc/Makefile.mak @@ -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 diff --git a/src/libopensc/module.c b/src/libopensc/module.c index 89d3d6af..d5898f51 100644 --- a/src/libopensc/module.c +++ b/src/libopensc/module.c @@ -23,7 +23,7 @@ #include #include #include -#include "../common/scdl.c" +#include int sc_module_open(struct sc_context *ctx, void **mod_handle, const char *filename) { diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am index dfa93561..76c82480 100644 --- a/src/pkcs11/Makefile.am +++ b/src/pkcs11/Makefile.am @@ -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 diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak index 15cacb86..855a0c6b 100644 --- a/src/pkcs11/Makefile.mak +++ b/src/pkcs11/Makefile.mak @@ -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 diff --git a/src/pkcs11/libpkcs11.c b/src/pkcs11/libpkcs11.c index 98781fa2..cda4ff8d 100644 --- a/src/pkcs11/libpkcs11.c +++ b/src/pkcs11/libpkcs11.c @@ -12,7 +12,7 @@ #include #include #include -#include "../common/scdl.c" +#include #define MAGIC 0xd00bed00 diff --git a/src/scdl/.cvsignore b/src/scdl/.cvsignore new file mode 100644 index 00000000..f20b38f0 --- /dev/null +++ b/src/scdl/.cvsignore @@ -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 diff --git a/src/scdl/Makefile.am b/src/scdl/Makefile.am new file mode 100644 index 00000000..41457ed7 --- /dev/null +++ b/src/scdl/Makefile.am @@ -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 diff --git a/src/scdl/Makefile.mak b/src/scdl/Makefile.mak new file mode 100644 index 00000000..f65a8aff --- /dev/null +++ b/src/scdl/Makefile.mak @@ -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 diff --git a/src/scdl/scdl.c b/src/scdl/scdl.c index 35285a06..a225185c 100644 --- a/src/scdl/scdl.c +++ b/src/scdl/scdl.c @@ -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) diff --git a/src/scdl/scdl.h b/src/scdl/scdl.h new file mode 100644 index 00000000..6e6fa157 --- /dev/null +++ b/src/scdl/scdl.h @@ -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 + * Olaf Kirch + * Stef Hoeben + */ + +#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