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@jtan.com>

diff --git a/Makefile.cvs b/Makefile.cvs
index d160702..5f31aa2 100644 (file)
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -1,8 +1,4 @@
 default: all
 
 all:
-       aclocal
-       autoheader
-       automake
-       autoconf
-
+       autoreconf --install

diff --git a/ftdipp/Makefile.am b/ftdipp/Makefile.am
index f1f9907..0b6da99 100644 (file)
--- 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/src/Makefile.am b/src/Makefile.am
index f550b06..c71fe60 100644 (file)
--- 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