[Pcsclite-cvs-commit] r1845 - in trunk/Drivers/ccid: examples src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-01-30 14:46:27 +0000 (Mon, 30 Jan 2006)
New Revision: 1845

Modified:
   trunk/Drivers/ccid/examples/Makefile.am
   trunk/Drivers/ccid/src/Makefile.am
Log:
use $(foo) instead of @foo@ to do not replace the values but the variables


Modified: trunk/Drivers/ccid/examples/Makefile.am
===================================================================
--- trunk/Drivers/ccid/examples/Makefile.am	2006-01-30 14:11:52 UTC (rev 1844)
+++ trunk/Drivers/ccid/examples/Makefile.am	2006-01-30 14:46:27 UTC (rev 1845)
@@ -2,6 +2,6 @@
 
 noinst_PROGRAMS = scardcontrol
 scardcontrol_SOURCES = scardcontrol.c
-scardcontrol_CFLAGS = @PCSC_CFLAGS@
-scardcontrol_LDADD = @PCSC_LIBS@
+scardcontrol_CFLAGS = $(PCSC_CFLAGS)
+scardcontrol_LDADD = $(PCSC_LIBS)
 

Modified: trunk/Drivers/ccid/src/Makefile.am
===================================================================
--- trunk/Drivers/ccid/src/Makefile.am	2006-01-30 14:11:52 UTC (rev 1844)
+++ trunk/Drivers/ccid/src/Makefile.am	2006-01-30 14:46:27 UTC (rev 1845)
@@ -41,16 +41,17 @@
 endif
 
 libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1)
-libccid_la_LIBADD = @LIBDL@ @LEXLIB@ @COREFOUNDATION@ @IOKIT@ @LIBUSB_LIBS@ @PTHREAD_LIBS@
-libccid_la_CFLAGS = @PCSC_CFLAGS@ @LIBUSB_CFLAGS@ @PTHREAD_CFLAGS@
+libccid_la_LIBADD = $(LIBDL) $(LEXLIB) $(COREFOUNDATION) $(IOKIT) \
+	$(LIBUSB_LIBS) $(PTHREAD_LIBS)
+libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS)
 
 libccidtwin_la_SOURCES = $(COMMON) $(SERIAL) $(T1)
-libccidtwin_la_CFLAGS = @PCSC_CFLAGS@ @PTHREAD_CFLAGS@ -DTWIN_SERIAL
-libccidtwin_la_LIBADD = @PTHREAD_LIBS@
+libccidtwin_la_CFLAGS = $(PCSC_CFLAGS) $(PTHREAD_CFLAGS) -DTWIN_SERIAL
+libccidtwin_la_LIBADD = $(PTHREAD_LIBS)
 
 parse_SOURCES = tokenparser.l parse.c parser.h debug.c
 parse_LDADD = libccid.la
-parse_CFLAGS = @PCSC_CFLAGS@ @LIBUSB_CFLAGS@
+parse_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS)
 
 EXTRA_DIST = Info.plist create_Info_plist.pl reader.conf.in \
 	towitoko/COPYING towitoko/README openct/LICENSE