The branch, master has been updated
via 3f916d5b6ee2d587d7c9069d4660b91fe42baa65 (commit)
via 2ede4aac4fd0726e86e88fe7bbfef2da2c29afd5 (commit)
from 996e9eee10870815423301c8805545e45d106286 (commit)
- Log -----------------------------------------------------------------
commit 3f916d5b6ee2d587d7c9069d4660b91fe42baa65
Author: Jim Paris <jim@xxxxxxxx>
Date: Fri May 22 14:48:57 2009 -0400
ftdi_eeprom requires libftdi 0.16
Since commit 13a25f0fce452792ba912b37d6cb87e512c864fb, this program
requires the new symbol ftdi_eeprom_decode, which is only provided
by libftdi >= 0.16.
Signed-off-by: Jim Paris <jim@xxxxxxxx>
commit 2ede4aac4fd0726e86e88fe7bbfef2da2c29afd5
Author: Jim Paris <jim@xxxxxxxx>
Date: Fri May 22 14:48:56 2009 -0400
ftdi_eeprom: 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
src/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 +-----
configure.in | 2 +-
src/Makefile.am | 4 ++--
3 files changed, 4 insertions(+), 8 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/configure.in b/configure.in
index 36af172..49550a3 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_PROG_CC
AC_CHECK_LIB(confuse, cfg_getstr,,[AC_MSG_ERROR(can't find confuse library)])
-PKG_CHECK_MODULES(LIBFTDI, libftdi)
+PKG_CHECK_MODULES(LIBFTDI, libftdi >= 0.16)
AC_SUBST(LIBFTDI_CFLAGS)
AC_SUBST(LIBFTDI_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 2216570..7966720 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,10 @@
bin_PROGRAMS = ftdi_eeprom
# set the include path found by configure
-INCLUDES = @LIBFTDI_CFLAGS@ $(all_includes)
+INCLUDES = @LIBFTDI_CFLAGS@
# the library search path.
-ftdi_eeprom_LDFLAGS = $(all_libraries)
+ftdi_eeprom_LDFLAGS =
ftdi_eeprom_SOURCES = main.c
noinst_DATA = example.conf
hooks/post-receive
--
utility to write the EEPROM connected to a FTDI USB-chip
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
