The branch, master has been updated
via e3d9bcdd6771a2464cd832b96e3da26a3ad804ac (commit)
via 1bbaf1ce8eb66272d33dffac19b72b87ef415179 (commit)
via 6b1c9d1f6de9b2f4bab8a27e6d9255072a945988 (commit)
from 672ac0087a0ee7a30f809d4a529285b74be3c54a (commit)
- Log -----------------------------------------------------------------
commit e3d9bcdd6771a2464cd832b96e3da26a3ad804ac
Author: Aurelien Jarno <aurelien@xxxxxxxxxxx>
Date: Sat May 23 01:46:58 2009 +0200
Fix out of tree building
commit 1bbaf1ce8eb66272d33dffac19b72b87ef415179
Author: Jim Paris <jim@xxxxxxxx>
Date: Fri May 22 15:26:39 2009 -0400
libftdi: Fix doxygen errors
Signed-off-by: Jim Paris <jim@xxxxxxxx>
commit 6b1c9d1f6de9b2f4bab8a27e6d9255072a945988
Author: Jim Paris <jim@xxxxxxxx>
Date: Fri May 22 14:48:21 2009 -0400
libftdi: Fix git build problems by using autoreconf
For recent versions of automake, the autotools steps in Makefile.cvs
don't work:
$ make -f Makefile.cvs
aclocal
autoheader
automake
configure.in: required file `./install-sh' not found
configure.in: required file `./mkinstalldirs' not found
configure.in: required file `./missing' not found
configure.in:7: required file `./config.guess' not found
configure.in:7: required file `./config.sub' not found
configure.in:7: required file `./ltmain.sh' not found
examples/Makefile.am: required file `./depcomp' not found
make: *** [all] Error 1
This is because automake no longer calls libtoolize, as described in:
http://www.gnu.org/software/automake/manual/html_node/Error-required-file-ltmain_002esh-not-found.html
The recommended workaround there is to use autoreconf rather than
calling individual autotools programs.
This patch also removes the use of all_includes and all_libraries, as
they are undefined and cause automake errors.
Signed-off-by: Jim Paris <jim@xxxxxxxx>
-----------------------------------------------------------------------
Summary of changes:
Makefile.cvs | 6 +-----
bindings/python/setup.py.in | 2 +-
ftdipp/Makefile.am | 4 ++--
ftdipp/ftdi.cpp | 9 +++++----
src/Makefile.am | 6 +-----
src/ftdi.c | 2 +-
6 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/Makefile.cvs b/Makefile.cvs
index d160702..5f31aa2 100644
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -1,8 +1,4 @@
default: all
all:
- aclocal
- autoheader
- automake
- autoconf
-
+ autoreconf --install
diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
index 6140858..b9ed07e 100644
--- a/bindings/python/setup.py.in
+++ b/bindings/python/setup.py.in
@@ -12,6 +12,6 @@ setup(name='@PACKAGE_NAME@',
py_modules=['ftdi'],
ext_modules=[Extension('_ftdi', ['ftdi_wrap.c'],
include_dirs=['@top_srcdir@/src'],
-
library_dirs=['@top_srcdir@/src/.libs','lib','/usr/lib'],
+
library_dirs=['@top_buildir@/src/.libs','lib','/usr/lib'],
libraries=['ftdi'])],
)
diff --git a/ftdipp/Makefile.am b/ftdipp/Makefile.am
index f1f9907..0b6da99 100644
--- a/ftdipp/Makefile.am
+++ b/ftdipp/Makefile.am
@@ -1,5 +1,5 @@
# set the include path found by configure
-INCLUDES= -I$(top_srcdir)/src $(all_includes) @BOOST_CPPFLAGS@
+INCLUDES= -I$(top_srcdir)/src @BOOST_CPPFLAGS@
# the library search path.
lib_LTLIBRARIES = libftdipp.la
@@ -9,7 +9,7 @@ libftdipp_la_SOURCES = ftdi.cpp
# Note: If you specify a:b:c as the version in the next line,
# the library that is made has version (a-c).c.b. In this
# example, the version is 2.1.2. (3:2:1)
-libftdipp_la_LDFLAGS = -version-info 17:0:16 $(all_libraries) @BOOST_LDFLAGS@
+libftdipp_la_LDFLAGS = -version-info 17:0:16 @BOOST_LDFLAGS@
libftdipp_la_LIBADD = $(top_builddir)/src/libftdi.la
EXTRA_DIST = CMakeLists.txt
diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp
index e5a8966..8f9e2b9 100644
--- a/ftdipp/ftdi.cpp
+++ b/ftdipp/ftdi.cpp
@@ -303,21 +303,22 @@ int Context::get_strings()
return 1;
}
-/*! \fn vendor
- * \fn description
- * \fn serial
- * \brief Device strings properties.
+/*! \brief Device strings properties.
*/
const std::string& Context::vendor()
{
return d->vendor;
}
+/*! \brief Device strings properties.
+ */
const std::string& Context::description()
{
return d->description;
}
+/*! \brief Device strings properties.
+ */
const std::string& Context::serial()
{
return d->serial;
diff --git a/src/Makefile.am b/src/Makefile.am
index f550b06..c71fe60 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,3 @@
-
-# set the include path found by configure
-INCLUDES= $(all_includes)
-
# the library search path.
lib_LTLIBRARIES = libftdi.la
libftdi_la_SOURCES = ftdi.c
@@ -10,6 +6,6 @@ include_HEADERS = ftdi.h
# Note: If you specify a:b:c as the version in the next line,
# the library that is made has version (a-c).c.b. In this
# example, the version is 2.1.2. (3:2:1)
-libftdi_la_LDFLAGS = -version-info 17:0:16 $(all_libraries)
+libftdi_la_LDFLAGS = -version-info 17:0:16
EXTRA_DIST = CMakeLists.txt
diff --git a/src/ftdi.c b/src/ftdi.c
index e6f96cb..f89e352 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -1941,7 +1941,7 @@ int ftdi_eeprom_build(struct ftdi_eeprom *eeprom,
unsigned char *output)
Decode binary EEPROM image into an ftdi_eeprom structure.
\param eeprom Pointer to ftdi_eeprom which will be filled in.
- \param output Buffer of \a size bytes of raw eeprom data
+ \param buf Buffer of \a size bytes of raw eeprom data
\param size size size of eeprom data in bytes
\retval 0: all fine
hooks/post-receive
--
A library to talk to FTDI chips
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
