Merge the includes-revamp branch into trunk.

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

View file

@ -1,6 +1,6 @@
# set the include path found by configure
INCLUDES= $(all_includes)
INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)
noinst_HEADERS = pn53x.h
noinst_LTLIBRARIES = libnfcchips.la

View file

@ -26,7 +26,7 @@
#include "pn53x.h"
#include "bitutils.h"
#include "../bitutils.h"
// PN53X configuration
const byte_t pncmd_get_firmware_version [ 2] = { 0xD4,0x02 };

View file

@ -24,7 +24,7 @@
#ifndef __NFC_CHIPS_PN53X_H__
#define __NFC_CHIPS_PN53X_H__
#include "nfc-types.h"
#include <nfc/nfc-types.h>
#define MAX_FRAME_LEN 264