[Pcsclite-cvs-commit] PCSC/src Makefile.am,1.29,1.30

[aet-guest@quantz.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv30373

Modified Files:
	Makefile.am 
Log Message:
Fix --disable-threadsafe issues


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile.am	7 Sep 2003 20:28:53 -0000	1.29
+++ Makefile.am	8 Sep 2003 10:06:48 -0000	1.30
@@ -30,9 +30,7 @@
 endif
 
 if PCSC_THR_SAFE
-PCSC_CLIENT = $(PCSC_THREAD_SRC)
-else
-PCSC_CLIENT =
+PCSC_CLIENT_THR = $(PCSC_THREAD_SRC)
 endif
 
 #PCSC_INCLUDE_LIBS   = -Wl,-framework,IOKit
@@ -54,13 +52,14 @@
 	$(PCSC_DYNLOAD_SRC) \
 	$(PCSC_HOTPLUG_SRC) \
 	$(PCSC_POWERMGT_SRC)
+libpcsclite_core_la_CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
 
 libpcsclite_la_SOURCES = \
 	debuglog.c \
 	winscard_msg.c \
 	$(PCSC_CLIENT_SRC) \
 	$(PCSC_SYSTEM_SRC) \
-	$(PCSC_CLIENT)
+	$(PCSC_CLIENT_THR)
 libpcsclite_la_LDFLAGS = -version-info 0:1:0
 libpcsclite_la_LIBADD = @LIBSMARTCARD@
 
@@ -72,7 +71,8 @@
 libmusclecard_la_LIBADD = libpcsclite.la @LIBDL@ @LIBFL@
 
 pcscd_SOURCES = pcscdaemon.c winscard_svc.c
-pcscd_LDADD = libpcsclite-core.la @LIBUSB@ @LIBDL@ @LIBFL@
+pcscd_CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
+pcscd_LDADD = libpcsclite-core.la @LIBUSB@ @LIBDL@ @LIBFL@ @PTHREAD_LIBS@
 
 testpcsc_SOURCES = testpcsc.c
 testpcsc_LDADD = libpcsclite.la