15 files changed, 16 insertions, 16 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index df5706a..dfaa277 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1,2 @@
 
-SUBDIRS = rfid
+SUBDIRS = librfid
diff --git a/include/rfid/Makefile.am b/include/librfid/Makefile.am
index 59ce8cb..59ce8cb 100644
--- a/include/rfid/Makefile.am
+++ b/include/librfid/Makefile.am
diff --git a/include/rfid/rfid.h b/include/librfid/rfid.h
index 6717ef8..6717ef8 100644
--- a/include/rfid/rfid.h
+++ b/include/librfid/rfid.h
diff --git a/include/rfid/rfid_asic.h b/include/librfid/rfid_asic.h
index 6511615..3686a7c 100644
--- a/include/rfid/rfid_asic.h
+++ b/include/librfid/rfid_asic.h
@@ -3,7 +3,7 @@
 
 enum rfid_frametype;
 
-#include <rfid/rfid_asic_rc632.h>
+#include <librfid/rfid_asic_rc632.h>
 
 struct rfid_asic_transport {
 	char *name;
diff --git a/include/rfid/rfid_asic_rc632.h b/include/librfid/rfid_asic_rc632.h
index e156814..893e73b 100644
--- a/include/rfid/rfid_asic_rc632.h
+++ b/include/librfid/rfid_asic_rc632.h
@@ -4,7 +4,7 @@
 struct rfid_asic_transport_handle;
 
 #include <sys/types.h>
-#include <rfid/rfid_asic.h>
+#include <librfid/rfid_asic.h>
 
 struct rfid_asic_rc632_transport {
 	struct {
diff --git a/include/rfid/rfid_layer2.h b/include/librfid/rfid_layer2.h
index 54c3c46..4622a02 100644
--- a/include/rfid/rfid_layer2.h
+++ b/include/librfid/rfid_layer2.h
@@ -2,7 +2,7 @@
 #define _RFID_LAYER2_H
 
 #include <sys/types.h>
-#include <rfid/rfid.h>
+#include <librfid/rfid.h>
 
 struct rfid_layer2_handle;
 struct rfid_reader_handle;
@@ -31,9 +31,9 @@ int rfid_layer2_setopt(struct rfid_layer2_handle *ph, int optname,
 
 #ifdef __LIBRFID__
 
-#include <rfid/rfid_layer2_iso14443a.h>
-#include <rfid/rfid_layer2_iso14443b.h>
-#include <rfid/rfid_layer2_iso15693.h>
+#include <librfid/rfid_layer2_iso14443a.h>
+#include <librfid/rfid_layer2_iso14443b.h>
+#include <librfid/rfid_layer2_iso15693.h>
 
 struct rfid_layer2 {
 	unsigned int id;
diff --git a/include/rfid/rfid_layer2_iso14443a.h b/include/librfid/rfid_layer2_iso14443a.h
index fc79bca..50a6f43 100644
--- a/include/rfid/rfid_layer2_iso14443a.h
+++ b/include/librfid/rfid_layer2_iso14443a.h
@@ -75,7 +75,7 @@ enum iso14443a_state {
 	ISO14443A_STATE_SELECTED,
 };
 
-#include <rfid/rfid_layer2.h>
+#include <librfid/rfid_layer2.h>
 struct rfid_layer2 rfid_layer2_iso14443a;
 
 #endif /* __LIBRFID__ */
diff --git a/include/rfid/rfid_layer2_iso14443b.h b/include/librfid/rfid_layer2_iso14443b.h
index 2bf8255..5d6d979 100644
--- a/include/rfid/rfid_layer2_iso14443b.h
+++ b/include/librfid/rfid_layer2_iso14443b.h
@@ -77,7 +77,7 @@ enum {
 	ISO14443B_STATE_HALTED,
 };
 
-#include <rfid/rfid_layer2.h>
+#include <librfid/rfid_layer2.h>
 struct rfid_layer2 rfid_layer2_iso14443b;
 
 #endif /* __LIBRFID__ */
diff --git a/include/rfid/rfid_layer2_iso15693.h b/include/librfid/rfid_layer2_iso15693.h
index 6ca1a7b..ea7f87a 100644
--- a/include/rfid/rfid_layer2_iso15693.h
+++ b/include/librfid/rfid_layer2_iso15693.h
@@ -49,7 +49,7 @@ enum iso15693_state {
 	ISO15693_STATE_NONE,
 };
 
-#include <rfid/rfid_layer2.h>
+#include <librfid/rfid_layer2.h>
 extern struct rfid_layer2 rfid_layer2_iso15693;
 
 #endif /* _ISO15693_H */
diff --git a/include/rfid/rfid_protocol.h b/include/librfid/rfid_protocol.h
index bd9570f..65bda4c 100644
--- a/include/rfid/rfid_protocol.h
+++ b/include/librfid/rfid_protocol.h
@@ -1,7 +1,7 @@
 #ifndef _RFID_PROTOCOL_H
 #define _RFID_PROTOCOL_H
 
-#include <rfid/rfid_layer2.h>
+#include <librfid/rfid_layer2.h>
 
 struct rfid_protocol_handle;
 
@@ -68,9 +68,9 @@ struct rfid_protocol {
 
 int rfid_protocol_register(struct rfid_protocol *p);
 
-#include <rfid/rfid_protocol_tcl.h>
-#include <rfid/rfid_protocol_mifare_ul.h>
-#include <rfid/rfid_protocol_mifare_classic.h>
+#include <librfid/rfid_protocol_tcl.h>
+#include <librfid/rfid_protocol_mifare_ul.h>
+#include <librfid/rfid_protocol_mifare_classic.h>
 
 struct rfid_protocol_handle {
 	struct rfid_layer2_handle *l2h;
diff --git a/include/rfid/rfid_protocol_mifare_classic.h b/include/librfid/rfid_protocol_mifare_classic.h
index e6b2400..e6b2400 100644
--- a/include/rfid/rfid_protocol_mifare_classic.h
+++ b/include/librfid/rfid_protocol_mifare_classic.h
diff --git a/include/rfid/rfid_protocol_mifare_ul.h b/include/librfid/rfid_protocol_mifare_ul.h
index cc93b6b..cc93b6b 100644
--- a/include/rfid/rfid_protocol_mifare_ul.h
+++ b/include/librfid/rfid_protocol_mifare_ul.h
diff --git a/include/rfid/rfid_protocol_tcl.h b/include/librfid/rfid_protocol_tcl.h
index f754ad9..f754ad9 100644
--- a/include/rfid/rfid_protocol_tcl.h
+++ b/include/librfid/rfid_protocol_tcl.h
diff --git a/include/rfid/rfid_reader.h b/include/librfid/rfid_reader.h
index 78d07e4..3581cc1 100644
--- a/include/rfid/rfid_reader.h
+++ b/include/librfid/rfid_reader.h
@@ -1,8 +1,8 @@
 #ifndef _RFID_READER_H
 #define _RFID_READER_H
 
-#include <rfid/rfid_asic.h>
-#include <rfid/rfid_layer2_iso14443a.h>
+#include <librfid/rfid_asic.h>
+#include <librfid/rfid_layer2_iso14443a.h>
 
 struct rfid_reader_handle;
 
diff --git a/include/rfid/rfid_reader_cm5121.h b/include/librfid/rfid_reader_cm5121.h
index 8d9a312..8d9a312 100644
--- a/include/rfid/rfid_reader_cm5121.h
+++ b/include/librfid/rfid_reader_cm5121.h