summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2006-05-27 16:06:18 +0000
committerlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2006-05-27 16:06:18 +0000
commitfd10ed49a877adc37c66d60581c589e3c1a49e2a (patch)
tree7dc4f12e668b5dfde0983f8586d1be436908741c /src
parent0c22a9dea729db9495024170484d5b711f2d2c56 (diff)
fix conditional compilation of internal CCID driver
git-svn-id: https://svn.gnumonks.org/trunk/librfid@1798 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am10
-rw-r--r--src/ccid/rfid_reader_cm5121_ccid_direct.c2
2 files changed, 9 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index dbc608f..ef44e7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,8 +6,14 @@ lib_LTLIBRARIES = librfid.la
CORE=rfid.c rfid_layer2.c rfid_protocol.c rfid_reader.c
L2=rfid_layer2_iso14443a.c rfid_layer2_iso14443b.c rfid_layer2_iso15693.c rfid_iso14443_common.c
PROTO=rfid_proto_tcl.c rfid_proto_mifare_ul.c rfid_proto_mifare_classic.c
-READER=rfid_reader_cm5121.c rfid_reader_cm5121_openct.c rfid_asic_rc632.c
+READER=rfid_reader_cm5121.c rfid_asic_rc632.c
+
+if MY_CCID
+READER_LOW=ccid/rfid_reader_cm5121_ccid_direct.c ccid/ccid-driver.c
+else
+READER_LOW=rfid_reader_cm5121_openct.c
+endif
librfid_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION) -lopenct
-librfid_la_SOURCES = $(CORE) $(L2) $(PROTO) $(READER)
+librfid_la_SOURCES = $(CORE) $(L2) $(PROTO) $(READER) $(READER_LOW)
diff --git a/src/ccid/rfid_reader_cm5121_ccid_direct.c b/src/ccid/rfid_reader_cm5121_ccid_direct.c
index a2dfb99..c6b2d15 100644
--- a/src/ccid/rfid_reader_cm5121_ccid_direct.c
+++ b/src/ccid/rfid_reader_cm5121_ccid_direct.c
@@ -5,7 +5,7 @@
#include <librfid/rfid_asic.h>
-#include <include/ccid/ccid-driver.h>
+#include "ccid-driver.h"
/* this is the sole function required by rfid_reader_cm5121.c */
int
personal git repositories of Harald Welte. Your mileage may vary