crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge the includes-revamp branch into trunk.

Browse source
This commit is contained in:
Romain Tartiere 2009-12-01 14:23:00 +00:00
parent b29860a93c
commit 2b8232b9ab
42 changed files with 63 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/examples/CMakeLists.txt
View file

@ -12,6 +12,10 @@ FOREACH(source ${EXAMPLES-SOURCES})
INSTALL(TARGETS ${source} RUNTIME DESTINATION bin COMPONENT examples)
ENDFOREACH(source)
# Headers
FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
INSTALL(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/nfc COMPONENT headers)
# Manuals for the examples
FILE(GLOB manuals "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
INSTALL(FILES ${manuals} DESTINATION ${SHARE_INSTALL_PREFIX}/man/man1 COMPONENT manuals)

2
src/examples/Makefile.am
View file

@ -1,7 +1,7 @@
bin_PROGRAMS = nfc-anticol nfc-list nfc-mfclassic nfc-mfultralight nfc-relay nfc-emulate nfcip-target nfcip-initiator
# set the include path found by configure
INCLUDES= $(all_includes)
INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)
nfcinclude_HEADERS = mifaretag.h mifareultag.h
nfcincludedir = $(includedir)/nfc

4
src/examples/nfc-anticol.c
View file

@ -28,9 +28,9 @@
#include <stdbool.h>
#include <string.h>
#include <nfc.h>
#include <nfc/nfc.h>
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
#include "bitutils.h"
#define SAK_FLAG_ATS_SUPPORTED 0x20

4
src/examples/nfc-emulate.c
View file

@ -27,9 +27,9 @@
#include <stdint.h>
#include <string.h>
#include <nfc.h>
#include <nfc/nfc.h>
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
#include "bitutils.h"
#define MAX_FRAME_LEN 264

4
src/examples/nfc-list.c
View file

@ -27,9 +27,9 @@
#include <string.h>
#include <nfc.h>
#include <nfc/nfc.h>
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
#include "bitutils.h"
#define MAX_DEVICE_COUNT 16

2
src/examples/nfc-mfclassic.c
View file

@ -30,7 +30,7 @@
#include <string.h>
#include <ctype.h>
#include <nfc.h>
#include <nfc/nfc.h>
#include "mifaretag.h"
#include "bitutils.h"

2
src/examples/nfc-mfultralight.c
View file

@ -30,7 +30,7 @@
#include <string.h>
#include <ctype.h>
#include <nfc.h>
#include <nfc/nfc.h>
#include "mifareultag.h"
#include "bitutils.h"

4
src/examples/nfc-relay.c
View file

@ -27,9 +27,9 @@
#include <string.h>
#include <signal.h>
#include <nfc.h>
#include <nfc/nfc.h>
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
#include "bitutils.h"
#define MAX_FRAME_LEN 264

2
src/examples/nfcip-initiator.c
View file

@ -23,7 +23,7 @@
#include <stdio.h>
#include <string.h>
#include <nfc.h>
#include <nfc/nfc.h>
#define MAX_FRAME_LEN 264

2
src/examples/nfcip-target.c
View file

@ -22,7 +22,7 @@
*/
#include <stdio.h>
#include <nfc.h>
#include <nfc/nfc.h>
#define MAX_FRAME_LEN 264