Commit graph

62 commits

Author SHA1 Message Date
Romain Tartiere
cd53efb038 Enforce ISO C conformance about empty files.
ISO C forbids empty source files.  Instead of compiling possibly empty source
files depending on the compiler parameters, only compile required files to
build the library as requested at the ./configure stage.

Windows users (and more precisely non-autotools users), you may have to update
whatever you use to build the libnfc to fit your needs.  The Makefile shipped
in the windows directory compiles all drivers as it is written so you should
not notice any difference, but if you don't use _that_ makefile, then you will
have to do some adjustment.

For now, keep the defines in CFLAGS just in case.  Planned for removal in circa
one week.

While here, pet `./configure` output (--help format and summary).
2010-07-31 13:21:56 +00:00
Romain Tartiere
67fb1330f8 Rework the indent target.
- Check indent is present at ./configure stage;
  - If gindent(1) is installed, use it instead of indent(1);
2010-07-21 13:09:48 +00:00
Romuald Conty
ec48f04dd8 Bump package version to 1.3.9 since trunk looks like 1.4.x series. 2010-06-07 13:33:33 +00:00
Romain Tartiere
7b65174856 Remove deprecated DEBUG_CFLAGS. 2010-04-16 12:58:29 +00:00
Romuald Conty
b55400a0d5 configure.ac rework
- Put libusb and PC/SC check in m4 macros.
- Suppress --disable-pcsclite and --disable-libusb
- Add --with-drivers option: we now could choose which driver to build. without this option a default set is build (ATM all drivers except PN532_UART)
2010-04-15 14:41:13 +00:00
Romuald Conty
f693040ced Disable compiler code optimizations and turn on gdb support when --enable-debug is passed to configure. 2010-04-09 23:41:35 +00:00
Romain Tartiere
c7d77d7664 Rearrange source code. 2010-04-07 14:37:19 +00:00
Romuald Conty
02a29920fc Prepare libnfc 1.3.4 2010-03-31 14:07:13 +00:00
Romain Tartiere
e223b93d91 The obsolete function usleep(3) also needs _XOPEN_SOURCE >= 500. 2010-02-20 13:01:43 +00:00
Romuald Conty
738885cc1a Prepare 1.3.3 2010-02-17 15:02:03 +00:00
Romuald Conty
e0d8e80b76 Add _DARWIN_C_SOURCE define to activate all library features on MacOS 2010-02-17 14:12:38 +00:00
Romain Tartiere
386597af6e Define _NETBSD_SOURCE that makes a few more serial speeds defined in termios.h. 2010-02-10 13:46:12 +00:00
Romain Tartiere
0d395733af Fix indent after last commit. 2010-02-10 11:23:38 +00:00
Romain Tartiere
c8c03fe2e0 Do not add libusb to PKG_CONFIG_REQUIRES unless it is located using this method. Fix build failure for software detecting libnfc using pkg-config on FreeBSD (at least) when libusb is part of the system. 2010-02-10 11:23:01 +00:00
Romain Tartiere
1e0272d006 Make configure fail if pkg-config cannot be found. 2010-02-08 19:43:25 +00:00
Romuald Conty
08cfcc30b0 Add some quotes to prevent from expanding. 2010-02-08 11:48:23 +00:00
Romuald Conty
ec9a13a2c3 Attach CMake files in generated archive. 2010-01-29 15:33:34 +00:00
Romuald Conty
22a0c4f99e Prepare 1.3.2 2010-01-29 15:05:11 +00:00
Romain Tartiere
7d20198520 Tweak the libusb detection.
1. Try to use pkg-config to locate libusb;
  2. Try with libusb-config if not found;
  3. Try to locate headers and lib if still not found.

This would hopefully prevent build failures in some very particular cases, such as cross compiling libnfc on a FreeBSD version for another FreeBSD version that does not use the same libusb.

http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/142836

Reported by:	Dmitry Marakasov
2010-01-28 13:56:04 +00:00
Romuald Conty
d7aeb8fb5b Prepare 1.3.1 2010-01-19 15:52:45 +00:00
Romuald Conty
2d4bdf28a1 Serial autoprobing is now DISABLED as default, fix Issue 58. 2010-01-18 11:23:07 +00:00
Romuald Conty
e4ca9245ec C99 compiler is a requirement so we don't need --enable-std99 anymore.
Define _XOPEN_SOURCE 600 using config.h
2010-01-12 17:58:13 +00:00
Romuald Conty
2079016a04 Remove autoreconf warnings by adding m4 directory 2009-12-20 19:14:41 +00:00
Romain Tartiere
61a0aba66e Make use of the new AM_SILENT_RULES macro of automake 1.11 if possible.
We can see warnings again!
2009-12-16 23:16:21 +00:00
Romain Tartiere
2b8232b9ab Merge the includes-revamp branch into trunk. 2009-12-01 14:23:00 +00:00
Romuald Conty
0f0c9abe24 Prepare next release.
Update Debian packages.
Set svn:ignore properties.
2009-11-27 15:44:25 +00:00
Romain Tartiere
5c164c97b2 Fix build on recent FreeBSD (ie. upcoming FreeBSD 8.0; FreeBSD CURRENT).
Since March 9, 2009; the FreeBSD operating system base ships with libusb.  As a consequence, the devel/libusb ports that used to provide userland programs access to USB devices is useless and so marked as IGNORE for recent versions of FreeBSD.  This patch detects the FreeBSD version configure is run on and conditionally ignore the libusb detection if relevant.

Obtained from:	Ooo vcs.
2009-11-26 23:32:40 +00:00
Romain Tartiere
fbb924e3bb Add workarounds for libusb in c99. 2009-11-24 12:55:34 +00:00
Romuald Conty
1e5658eeba Make distcheck OK.
Add SVN revision to libnfc version (if available).
2009-11-20 13:43:18 +00:00
Romuald Conty
877176c98f Attempt to extract PN53x related code for nfc.c.
multichip> chips sub-folder introduction with pn53x.h/c.
2009-11-20 11:27:07 +00:00
Romuald Conty
2a0ff6c5d0 Rename chip_type to nfc_chip_t.
Rename dev_spec to nfc_device_spec_t.
Update configure.ac and autotools related files.
2009-11-18 10:52:13 +00:00
Romuald Conty
473965d3a6 It now works on MacOS. 2009-11-04 14:55:24 +00:00
Romuald Conty
06a76f6470 Attempt to make it works on MacOS. Small fixes. CMake work started. 2009-11-04 10:42:53 +00:00
Romuald Conty
14a9112dea It now compile using Autotools. 2009-11-04 10:14:17 +00:00
Romuald Conty
4a03864bea Add "make html" directive: it will build API documentation using Doxygen. (--enable-doc flag is required at configure time) 2009-10-20 10:19:31 +00:00
Romuald Conty
d3ddf40484 Fix typo.
Add doxygen detection and --enable-doc flag to ./configure.
2009-10-13 12:43:52 +00:00
Romuald Conty
32cd8559b4 Remove not needed #include in libnfc.h.
Minor change in version format.
2009-10-06 16:01:06 +00:00
Romuald Conty
6aae96e1e1 Move examples into src/examples subdirectory.
Change examples names to nfc-* (or nfcip-*).
2009-10-06 08:32:50 +00:00
Romuald Conty
dd34bfbf75 Append SVN revision to library version. 2009-10-05 14:51:09 +00:00
Romuald Conty
e2dc2c133a Fix "Requires: " section in pkg-config file when libusb or libpcsclite were disabled. 2009-09-10 13:18:51 +00:00
Romuald Conty
6634d185bb Add ./configure option to disable libusb (removes PN531USB and PN533USB support).
Enhance "./configure --help" options descriptions.
2009-09-10 10:39:25 +00:00
Romuald Conty
be55ba2955 WARNING: API changed: nfc_connect() now take one argument. Have a look at nfc-list example (list.c) or at directly at function Doxygen comment (libnfc.h).
Add configure option: --disable-serial-autoprobe to fix Issue 2 (Autotools and CMake).
Fix Issue 11: it is now possible to specify a wanted device using new struct "nfc_device_desc_t".
Code cleanup.
2009-09-04 13:24:34 +00:00
Romuald Conty
e05af04cce C99 standard can now be disabled by configure using "--disable-std-c99" flag. 2009-08-26 09:14:23 +00:00
Romuald Conty
b08951a43e Attempt to fix rpath issue on linux platform (it is already deprecated in main distributions. i.e. http://wiki.debian.org/RpathIssue) 2009-08-26 08:54:39 +00:00
Romuald Conty
d6a4a2b422 Update ChangeLog, debian files and bump library version to 1.2.1. 2009-07-24 14:51:03 +00:00
Romuald Conty
62e71024cf Bump library version to 1.2.0 2009-07-23 13:34:02 +00:00
Romuald Conty
440fa38889 Fix PCSC headers path on MacOS. 2009-07-22 09:35:48 +00:00
Romuald Conty
45b2cfa258 Improve libusb detection if pkg-config is not present. 2009-06-30 13:30:31 +00:00
Romuald Conty
db6375511d Improve MacOSX portability (again): many thanks to Daniel Macks <dmacks@netspace.org> from #fink irc channel. 2009-06-29 08:47:19 +00:00
Romuald Conty
658f24ba3e Improve MacOSX portability: many thanks to Daniel Macks <dmacks@netspace.org> from #fink irc channel. 2009-06-29 08:32:07 +00:00