[Pcsclite-cvs-commit] r1959 - trunk/PCSC/src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-03-21 14:02:03 +0000 (Tue, 21 Mar 2006)
New Revision: 1959

Modified:
   trunk/PCSC/src/Makefile.am
Log:
do not use libpcsclite-core anymore since the same source code generates
two different object files (depending on the presence of -DPCSCD)


Modified: trunk/PCSC/src/Makefile.am
===================================================================
--- trunk/PCSC/src/Makefile.am	2006-03-21 14:00:35 UTC (rev 1958)
+++ trunk/PCSC/src/Makefile.am	2006-03-21 14:02:03 UTC (rev 1959)
@@ -5,62 +5,64 @@
 	$(SYMBOL_VISIBILITY)
 
 lib_LTLIBRARIES = libpcsclite.la
-noinst_LTLIBRARIES = libpcsclite-core.la
 
 if !HAVE_SCF
 sbin_PROGRAMS = pcscd
 endif
 noinst_PROGRAMS = testpcsc
 
-PCSC_DYNLOAD_SRC = dyn_unix.c dyn_hpux.c dyn_macosx.c
-PCSC_SYSTEM_SRC  = sys_unix.c
-PCSC_THREAD_SRC  = thread_unix.c
-PCSC_HOTPLUG_SRC  = \
-	hotplug_generic.c hotplug_libusb.c \
-	hotplug_linux.c hotplug_macosx.c
-PCSC_POWERMGT_SRC = powermgt_generic.c powermgt_macosx.c
-
 if HAVE_SCF
 PCSC_CLIENT_SRC  = winscard_scf.c
 else
 PCSC_CLIENT_SRC  = winscard_clnt.c
 endif
 
-libpcsclite_core_la_SOURCES = \
+libpcsclite_la_SOURCES = \
+	dyn_hpux.c \
+	dyn_macosx.c \
+	dyn_unix.c \
+	error.c \
+	$(PCSC_CLIENT_SRC) \
+	strlcat.c \
+	strlcpy.c \
+	sys_unix.c \
+	thread_unix.c \
+	winscard_msg.c
+libpcsclite_la_LDFLAGS = -version-info 1:0:0
+libpcsclite_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS)
+libpcsclite_la_LIBADD = $(COREFOUNDATION) $(LIBSMARTCARD) $(LIBDL) \
+	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+pcscd_SOURCES = \
 	atrhandler.c \
 	configfile.l \
+	debuglog.c \
 	eventhandler.c \
 	ifdwrapper.c \
+	pcscdaemon.c \
+	dyn_unix.c \
+	dyn_hpux.c \
+	dyn_macosx.c \
+	hotplug_generic.c \
+	hotplug_libusb.c \
+	hotplug_linux.c \
+	hotplug_macosx.c \
+	powermgt_generic.c \
+	powermgt_macosx.c \
+	sys_unix.c \
+	thread_unix.c \
 	prothandler.c \
 	readerfactory.c \
+	strlcat.c \
+	strlcpy.c \
+	tokenparser.l \
 	winscard.c \
 	winscard_msg.c \
-	$(PCSC_SYSTEM_SRC) \
-	$(PCSC_THREAD_SRC) \
-	$(PCSC_DYNLOAD_SRC) \
-	$(PCSC_HOTPLUG_SRC) \
-	$(PCSC_POWERMGT_SRC) \
-	strlcpy.c strlcat.c
-libpcsclite_core_la_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
-
-libpcsclite_la_SOURCES = \
-	debuglog.c \
-	winscard_msg.c \
-	$(PCSC_CLIENT_SRC) \
-	$(PCSC_SYSTEM_SRC) \
-	$(PCSC_THREAD_SRC) \
-	$(PCSC_DYNLOAD_SRC) \
-	strlcpy.c strlcat.c \
-	misc.h
-libpcsclite_la_LDFLAGS = -version-info 1:0:0
-libpcsclite_la_LIBADD = $(COREFOUNDATION) $(LIBSMARTCARD) $(LIBDL) \
-	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-
-pcscd_SOURCES = pcscdaemon.c winscard_svc.c debuglog.c winscard_msg_srv.c \
-	tokenparser.l
+	winscard_msg_srv.c \
+	winscard_svc.c
 pcscd_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) -DPCSCD
 pcscd_LDFLAGS = $(LDFLAGS) -export-dynamic
-pcscd_LDADD = libpcsclite-core.la \
+pcscd_LDADD = \
 	$(PTHREAD_LIBS) $(COREFOUNDATION) \
 	$(LIBUSB_LIBS) $(LIBDL) $(IOKIT) \
 	$(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
@@ -69,14 +71,29 @@
 testpcsc_LDADD = libpcsclite.la
 
 nobase_include_HEADERS = \
-	PCSC/debuglog.h PCSC/ifdhandler.h \
-	PCSC/winscard.h PCSC/wintypes.h
+	PCSC/debuglog.h \
+	PCSC/ifdhandler.h \
+	PCSC/winscard.h \
+	PCSC/wintypes.h
 noinst_HEADERS = \
-	atrhandler.h configfile.h dyn_generic.h eventhandler.h \
-	hotplug.h ifdwrapper.h PCSC/pcsclite.h.in \
-	powermgt_generic.h prothandler.h readerfactory.h \
-	strlcpycat.h parser.h sys_generic.h thread_generic.h \
-	winscard_msg.h winscard_svc.h
+	atrhandler.h \
+	configfile.h \
+	debug.h \
+	dyn_generic.h \
+	eventhandler.h \
+	hotplug.h \
+	ifdwrapper.h \
+	misc.h \
+	parser.h \
+	PCSC/pcsclite.h.in \
+	powermgt_generic.h \
+	prothandler.h \
+	readerfactory.h \
+	strlcpycat.h \
+	sys_generic.h \
+	thread_generic.h \
+	winscard_msg.h \
+	winscard_svc.h
 
 nodistheaderdir = $(includedir)/PCSC
 nodistheader_DATA = PCSC/reader.h PCSC/pcsclite.h