From 6b5c0f692d9076af73d09f8a66e0a7a80f9849ae Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Wed, 9 Jun 2010 15:45:20 +0000 Subject: [PATCH] renamed ccid to ccid-emulator to avoid conflicts with libccid git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@143 96b47cad-a561-4643-ad3b-153ac7d7599c --- bitbake/{ccid-tool.bb => ccid-emulator.bb} | 2 +- ccid/configure.ac | 6 +++--- ccid/src/Makefile.am | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) rename bitbake/{ccid-tool.bb => ccid-emulator.bb} (92%) diff --git a/bitbake/ccid-tool.bb b/bitbake/ccid-emulator.bb similarity index 92% rename from bitbake/ccid-tool.bb rename to bitbake/ccid-emulator.bb index fc1ba70..5d861f4 100644 --- a/bitbake/ccid-tool.bb +++ b/bitbake/ccid-emulator.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "pcsc-lite linux-libc-headers openssl opensc" RDEPENDS = "pcsc-lite kernel-module-gadgetfs libcrypto opensc" -SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=ccid;proto=https;rev=125" +SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=ccid;proto=https" S = "${WORKDIR}/ccid" diff --git a/ccid/configure.ac b/ccid/configure.ac index 1e6e641..437773b 100644 --- a/ccid/configure.ac +++ b/ccid/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([ccid], [0.2], [morgner@informatik.hu-berlin.de]) +AC_INIT([ccid-emulator], [0.2], [morgner@informatik.hu-berlin.de]) AC_CONFIG_SRCDIR([src/ccid.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -108,7 +108,7 @@ AC_CHECK_FUNCS([memmove memset strerror]) cat << EOF -ccid has been configured with following options: +ccid-emulator has been configured with following options: Version: ${PACKAGE_VERSION} User binaries: $(eval eval eval echo "${bindir}") @@ -129,7 +129,7 @@ OPENSC_LIBS: ${OPENSC_LIBS} OPENSSL_CFLAGS: ${OPENSSL_CFLAGS} OPENSSL_LIBS: ${OPENSSL_LIBS} -ccid support: ${enable_ccid} +emulator support: ${enable_ccid} pace support: ${enable_pace} EOF diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am index f60ea1d..44bf38c 100644 --- a/ccid/src/Makefile.am +++ b/ccid/src/Makefile.am @@ -2,15 +2,15 @@ IFDNFC_LIB = libifdnfc.$(DYN_LIB_EXT) bin_PROGRAMS = if WITH_CCID -bin_PROGRAMS += ccid +bin_PROGRAMS += ccid-emulator endif if WITH_PACE bin_PROGRAMS += pace-tool endif -ccid_SOURCES = ccid.c usbstring.c usb.c binutil.c scutil.c -ccid_LDADD = $(OPENSC_LIBS) $(PTHREAD_LIBS) -ccid_CFLAGS = $(OPENSC_CFLAGS) $(PTHREAD_CFLAGS) +ccid_emulator_SOURCES = ccid.c usbstring.c usb.c binutil.c scutil.c +ccid_emulator_LDADD = $(OPENSC_LIBS) $(PTHREAD_LIBS) +ccid_emulator_CFLAGS = $(OPENSC_CFLAGS) $(PTHREAD_CFLAGS) pace_tool_SOURCES = sm.c pace-tool.c binutil.c scutil.c pace.c pace_lib.c pace_tool_LDADD = $(OPENSC_LIBS) $(OPENSSL_LIBS)