[Pcsclite-cvs-commit] Drivers/ccid/src Makefile.am,1.8,1.9

rousseau@quantz.debian.org rousseau@quantz.debian.org
Thu, 22 Jan 2004 15:00:40 +0100


Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory quantz:/tmp/cvs-serv3863/src

Modified Files:
	Makefile.am 
Log Message:
move rules for src/protocol_t1/ files in src/Makefile.am to avoid
building a (problematic) static library


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	15 Jan 2004 14:23:41 -0000	1.8
+++ Makefile.am	22 Jan 2004 14:00:38 -0000	1.9
@@ -1,7 +1,5 @@
 # $Id$
 
-SUBDIRS = protocol_t1
-
 CCID_BUNDLE = ifd-ccid.bundle
 CCID_LIB = libccid.$(DYN_LIB_EXT)
 CCIDTWIN_LIB = libccidtwin.$(DYN_LIB_EXT)
@@ -9,22 +7,40 @@
 lib_LTLIBRARIES = libccid.la libccidtwin.la
 bin_PROGRAMS = parse
 
-COMMON = ccid.c ccid.h \
-	commands.c commands.h debug.c debug.h defs.h ifdhandler.c \
-	ifdhandler.h pcscdefines.h utils.c utils.h
+COMMON = ccid.c \
+	ccid.h \
+	commands.c \
+	commands.h \
+	debug.c \
+	debug.h \
+	defs.h \
+	ifdhandler.c \
+	ifdhandler.h \
+	pcscdefines.h \
+	utils.c \
+	utils.h
 USB = ccid_usb.c ccid_usb.h
 SERIAL = ccid_serial.c ccid_serial.h
+T1 = protocol_t1/apdu.h \
+	protocol_t1/atr.c \
+	protocol_t1/atr.h \
+	protocol_t1/defines.h \
+	protocol_t1/pps.c \
+	protocol_t1/pps.h \
+	protocol_t1/protocol_t1.c \
+	protocol_t1/protocol_t1.h \
+	protocol_t1/t1_block.c \
+	protocol_t1/t1_block.h
 
 # needed for MacOS X
 if NEED_PARSER
 TOKEN_PARSER = tokenparser_macosx.l
 endif
 
-libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER)
-libccid_la_LIBADD = @LIBDL@ @LEXLIB@ @COREFOUNDATION@ @IOKIT@ @LIBUSB@ \
-	protocol_t1/libt1.a
+libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(T1)
+libccid_la_LIBADD = @LIBDL@ @LEXLIB@ @COREFOUNDATION@ @IOKIT@ @LIBUSB@
 
-libccidtwin_la_SOURCES = $(COMMON) $(SERIAL) protocol_t1/libt1.a
+libccidtwin_la_SOURCES = $(COMMON) $(SERIAL) $(T1)
 libccidtwin_la_CFLAGS = -DTWIN_SERIAL
 
 parse_SOURCES = tokenparser.l parse.c parser.h