[Pcsclite-cvs-commit] PCSC/src Makefile.am,1.26,1.27 hotplug_libusb.c,1.7,1.8 pcscdaemon.c,1.29,1.30 tokenfactory.c,1.9,1.10 winscard_msg.c,1.5,1.6
aet-guest@quantz.debian.org
aet-guest@quantz.debian.org
Sun, 07 Sep 2003 19:34:44 +0200
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv30235/src
Modified Files:
Makefile.am hotplug_libusb.c pcscdaemon.c tokenfactory.c
winscard_msg.c
Log Message:
- Remove MSC/PCSC_TARGET_XYZ defines and the massive
use of unflexible automake conditionals. The main
reason why pcsc-lite requires "too much" work when
porting to another OS. Introduced define PCSC_ARCH,
which uses 'uname' as an input. Except Darwin->MacOS.
- Removed --enable-usb
- Preliminary rewrite of src/Makefile.am, doesn't work
yet.
- Use gcc specific compiler options only if
gcc detected.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am 7 Sep 2003 17:20:22 -0000 1.26
+++ Makefile.am 7 Sep 2003 17:34:42 -0000 1.27
@@ -5,113 +5,41 @@
pc_DATA = libpcsclite.pc
SUBDIRS = . utils
+
lib_LTLIBRARIES = libpcsclite.la libmusclecard.la
noinst_LTLIBRARIES = libpcsclite-core.la
sbin_PROGRAMS = pcscd
-include_HEADERS = mscdefines.h musclecard.h pcsclite.h winscard.h \
- wintypes.h debuglog.h
check_PROGRAMS = testpcsc muscletest
-#TESTS = testpcsc
-if PCSC_ARCH_LINUX
-PCSC_MYLDFLAGS =
-PCSC_INCLUDE_LIBS = -lfl -ldl
-PCSCD_INCLUDE_LIBS = -lfl -ldl -lpthread
-PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
-PCSC_DYNLOAD_SOURCE = dyn_unix.c dyn_generic.h
-PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
-PCSC_CLIENT_SRC = winscard_clnt.c
-if PCSC_USE_LIBUSB
-PCSC_HOTPLUG_SOURCE = hotplug_libusb.c hotplug.h
-PCSCD_EXTRA_LIB = -lusb
-else
-if PCSC_LINUX_USB
-PCSC_HOTPLUG_SOURCE = hotplug_linux.c hotplug.h
-else
-PCSC_HOTPLUG_SOURCE = hotplug_generic.c hotplug.h
-endif
-endif
-endif
-
-if PCSC_ARCH_BSD
-PCSC_MYLDFLAGS =
-PCSC_INCLUDE_LIBS = -lfl
-PCSCD_INCLUDE_LIBS = -lfl -pthread
-PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
-PCSC_DYNLOAD_SOURCE = dyn_unix.c dyn_generic.h
-PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
-PCSC_CLIENT_SRC = winscard_clnt.c
-if PCSC_USE_LIBUSB
-PCSC_HOTPLUG_SOURCE = hotplug_libusb.c hotplug.h
-else
-PCSC_HOTPLUG_SOURCE = hotplug_generic.c hotplug.h
-endif
-endif
+include_HEADERS = \
+ pcsclite.h winscard.h wintypes.h debuglog.h \
+ mscdefines.h musclecard.h
if PCSC_ARCH_OSX
-PCSC_MYLDFLAGS = -framework CoreFoundation
-PCSC_INCLUDE_LIBS = -ll -lIOKit
-PCSCD_INCLUDE_LIBS = -ll -lIOKit
-PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
-PCSC_DYNLOAD_SOURCE = dyn_macosx.c dyn_generic.h
-PCSC_HOTPLUG_SOURCE = hotplug_macosx.c hotplug.h powermgt_macosx.c \
- powermgt_generic.h
-PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
-PCSC_CLIENT_SRC = winscard_clnt.c
-INCLUDES = -I/System/Library/Frameworks/IOKit.framework/Headers/usb \
- -I/System/Library/Frameworks/IOKit.framework/Headers
+PCSC_INCLUDE_LIBS = -Wl,-framework,IOKit
+PCSCD_INCLUDE_LIBS = -Wl,-framework,IOKit -Wl,-framework,CoreFoundation
endif
-if PCSC_ARCH_SOLARIS
-PCSC_MYLDFLAGS =
+PCSC_DYNLOAD_SOURCE = dyn_unix.c dyn_hpux.c dyn_macosx.c dyn_generic.h
+PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
+PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
if MSC_ENABLE_SCF
-PCSC_INCLUDE_LIBS = -ll -ldl -lnsl -lsocket -lposix4 -lsmartcard
-INCLUDES = -I/usr/include/smartcard
PCSC_CLIENT_SRC = winscard_scf.c
+SCF_LIBS = -lsmartcard
+SCF_CFLAGS = -I/usr/include/smartcard
else
-PCSC_INCLUDE_LIBS = -ll -ldl -lnsl -lsocket -lposix4
PCSC_CLIENT_SRC = winscard_clnt.c
endif
-PCSCD_INCLUDE_LIBS = -ll -ldl -lnsl -lsocket -lposix4 -lpthread
-PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
-PCSC_DYNLOAD_SOURCE = dyn_unix.c dyn_generic.h
-PCSC_HOTPLUG_SOURCE = hotplug_generic.c hotplug.h
-PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
-endif
-
-if PCSC_ARCH_HPUX
-PCSC_MYLDFLAGS =
-PCSC_INCLUDE_LIBS = -ll
-PCSCD_INCLUDE_LIBS = -ll -lpthread
-PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
-PCSC_DYNLOAD_SOURCE = dyn_hpux.c dyn_generic.h
-PCSC_HOTPLUG_SOURCE = hotplug_generic.c hotplug.h
-PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
-PCSC_CLIENT_SRC = winscard_clnt.c
-endif
-
-if PCSC_ARCH_TRU64
-PCSC_MYLDFLAGS =
-PCSC_INCLUDE_LIBS = -ll
-PCSCD_INCLUDE_LIBS = -ll -lpthread
-PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
-PCSC_DYNLOAD_SOURCE = dyn_unix.c dyn_generic.h
-PCSC_HOTPLUG_SOURCE = hotplug_generic.c hotplug.h
-PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
-PCSC_CLIENT_SRC = winscard_clnt.c
-endif
-
-if PCSC_ARCH_AIX
-PCSC_MYLDFLAGS =
-PCSC_INCLUDE_LIBS = -ll -lbsd
-PCSCD_INCLUDE_LIBS = -ll -lpthread
-PCSC_THREAD_SOURCE = thread_unix.c thread_generic.h
-PCSC_DYNLOAD_SOURCE = dyn_unix.c dyn_generic.h
+if PCSC_USE_LIBUSB
+PCSC_HOTPLUG_SOURCE = hotplug_libusb.c hotplug.h
+elif PCSC_LINUX_USB
+PCSC_HOTPLUG_SOURCE = hotplug_linux.c hotplug.h
+elif PCSC_ARCH_OSX
+PCSC_HOTPLUG_SOURCE = hotplug_macosx.c hotplug.h powermgt_macosx.c powermgt_generic.h
+else
PCSC_HOTPLUG_SOURCE = hotplug_generic.c hotplug.h
-PCSC_SYSTEM_SOURCE = sys_unix.c sys_generic.h
-PCSC_CLIENT_SRC = winscard_clnt.c
endif
if PCSC_THR_SAFE
@@ -133,6 +61,7 @@
winscard_msg.c winscard_msg.h \
$(PCSC_SYSTEM_SOURCE) $(PCSC_THREAD_SOURCE) $(PCSC_HOTPLUG_SOURCE) \
$(PCSC_DYNLOAD_SOURCE)
+libpcsclite_core_la_LDADD = @LIBDL@
libpcsclite_core_la_LDFLAGS = -version-info 0:2:0 $(PCSC_INCLUDE_LIBS)
libpcsclite_la_SOURCES = $(PCSC_CLIENT_SRC) debuglog.c $(PCSC_SYSTEM_SOURCE) \
@@ -144,9 +73,8 @@
libmusclecard_la_LDFLAGS = -lpcsclite
pcscd_SOURCES = pcscdaemon.c winscard_svc.c winscard_svc.h
-pcscd_LDADD = libpcsclite-core.la
-pcscd_LDFLAGS = $(PCSC_MYLDFLAGS) -rdynamic $(PCSCD_INCLUDE_LIBS) \
- $(PCSCD_EXTRA_LIB)
+pcscd_LDADD = libpcsclite-core.la @LIBUSB@ @LIBDL@
+pcscd_LDFLAGS = -rdynamic $(PCSCD_INCLUDE_LIBS)
AM_CFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
@@ -163,4 +91,3 @@
$(SHELL) $(YLWRAP) $< lex.tp.c $@ -- "$(LEX)" -Ptp $(AM_LFLAGS) $(LFLAGS)
EXTRA_DIST = README_INTERNALS.txt dyn_win32.c thread_win32.c
-
Index: hotplug_libusb.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_libusb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hotplug_libusb.c 26 Aug 2003 13:38:58 -0000 1.7
+++ hotplug_libusb.c 7 Sep 2003 17:34:42 -0000 1.8
@@ -253,7 +253,7 @@
*/
for (i=0; i<PCSCLITE_MAX_READERS; i++)
{
-#ifdef MSC_TARGET_BSD
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
int fd;
char filename[BUS_DEVICE_STRSIZE];
Index: pcscdaemon.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/pcscdaemon.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pcscdaemon.c 7 Sep 2003 17:20:22 -0000 1.29
+++ pcscdaemon.c 7 Sep 2003 17:34:42 -0000 1.30
@@ -39,10 +39,7 @@
#include "debuglog.h"
#include "readerfactory.h"
#include "configfile.h"
-
-#ifdef PCSC_TARGET_OSX
#include "powermgt_generic.h"
-#endif
static char AraKiri = 0;
static char Init = 1;
@@ -115,11 +112,9 @@
HPRegisterForHotplugEvents();
/*
- * Set up the power management callback routine for OS X
+ * Set up the power management callback routine
*/
-#ifdef PCSC_TARGET_OSX
PMRegisterForPowerEvents();
-#endif
while (1)
{
Index: tokenfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenfactory.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tokenfactory.c 4 Jun 2003 16:52:39 -0000 1.9
+++ tokenfactory.c 7 Sep 2003 17:34:42 -0000 1.10
@@ -263,49 +263,15 @@
return -1;
}
}
-#ifdef WIN32
+#if defined(WIN32)
sprintf(fullLibPath, "%s%s%s%s", MSC_SVC_DROPDIR,
findData.cFileName, "\\Contents\\Win32\\", keyValue);
-#else
-#ifdef MSC_TARGET_LINUX
- sprintf(fullLibPath, "%s%s%s%s", MSC_SVC_DROPDIR,
- currFP->d_name, "/Contents/Linux/", keyValue);
-#else
-#ifdef MSC_TARGET_OSX
+#elif defined(__APPLE__)
sprintf(fullLibPath, "%s%s", MSC_SVC_DROPDIR,
currFP->d_name);
-
-#else
-#ifdef MSC_TARGET_BSD
- sprintf(fullLibPath, "%s%s%s%s", MSC_SVC_DROPDIR,
- currFP->d_name, "/Contents/BSD/", keyValue);
-
-#else
-#ifdef MSC_TARGET_SOLARIS
- sprintf(fullLibPath, "%s%s%s%s", MSC_SVC_DROPDIR,
- currFP->d_name, "/Contents/Solaris/", keyValue);
-
-#else
-#ifdef MSC_TARGET_HPUX
- sprintf(fullLibPath, "%s%s%s%s", MSC_SVC_DROPDIR,
- currFP->d_name, "/Contents/HPUX/", keyValue);
-
#else
-#ifdef MSC_TARGET_TRU64
- sprintf(fullLibPath, "%s%s%s%s", MSC_SVC_DROPDIR,
- currFP->d_name, "/Contents/Tru64/", keyValue);
-
-#else
-#ifdef MSC_TARGET_CYGWIN
- sprintf(fullLibPath, "%s%s%s%s", MSC_SVC_DROPDIR,
- currFP->d_name, "/Contents/CygWin/", keyValue);
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
+ sprintf(fullLibPath, "%s%s/Contents/%s%s", MSC_SVC_DROPDIR,
+ currFP->d_name, PCSC_ARCH, keyValue);
#endif
if (fullLibPath == NULL)
Index: winscard_msg.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_msg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- winscard_msg.c 22 Apr 2002 18:42:44 -0000 1.5
+++ winscard_msg.c 7 Sep 2003 17:34:42 -0000 1.6
@@ -28,7 +28,7 @@
#include "config.h"
-#ifdef PCSC_TARGET_SOLARIS
+#ifdef HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif