Added C++ examples to the build process

diff --git a/configure.in b/configure.in
index 9620cff..51df22a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -78,7 +78,7 @@ if test "x$ENABLE_LIBFTDIPP" = "x1"; then
 else
     AC_MSG_RESULT(no)
 fi
-AC_SUBST(ENABLE_LIBFTDIPP)
+AM_CONDITIONAL(HAVE_LIBFTDIPP, [test "x$ENABLE_LIBFTDIPP" = "x1"])
 
 dnl check for doxygen
 AC_PATH_PROG(DOXYGEN, doxygen)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index ce82a62..bd57253 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,13 +1,23 @@
 METASOURCES = AUTO
-INCLUDES = -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/ftdipp
 LDADD = $(top_builddir)/src/libftdi.la
 
+
+if HAVE_LIBFTDIPP
+examples_libftdipp = find_all_pp \
+       memorytest
+else
+examples_libftdipp =
+endif
+
+
 bin_PROGRAMS = simple \
        bitbang       \
        bitbang2      \
        bitbang_ft2232 \
        bitbang_cbus \
-       find_all
+       find_all \
+       $(examples_libftdipp)
 
 # Don't install the example files
 AM_LDFLAGS = -no-install
@@ -18,3 +28,10 @@ bitbang2_SOURCES = bitbang2.c
 bitbang_ft2232_SOURCES = bitbang_ft2232.c
 bitbang_cbus_SOURCES = bitbang_cbus.c
 find_all_SOURCES = find_all.c
+
+if HAVE_LIBFTDIPP
+find_all_pp_SOURCES = find_all_pp.cpp
+find_all_pp_LDADD = $(top_builddir)/ftdipp/libftdipp.la $(LDADD)
+memorytest_SOURCES = memorytest.cpp
+memorytest_LDADD = $(top_builddir)/ftdipp/libftdipp.la $(LDADD)
+endif

diff --git a/examples/find_all.cpp b/examples/find_all_pp.cpp
similarity index 97%
rename from examples/find_all.cpp
rename to examples/find_all_pp.cpp
index cc321f1..7a5a85d 100644 (file)
--- a/examples/find_all.cpp
+++ b/examples/find_all_pp.cpp
@@ -1,4 +1,4 @@
-/* cpp-simple.cpp
+/* final_all_pp.cpp
 
    Simple libftdi-cpp usage
 
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
    // Parse args
    int vid = 0x0403, pid = 0x6010, tmp = 0;
    for(int i = 0; i < (argc - 1); i++)
-   {        
+   {
       if(strcmp(argv[i], "-v") == 0)
          if((tmp = strtol(argv[++i], 0, 16)) >= 0)
             vid = tmp;

diff --git a/libftdi.spec.in b/libftdi.spec.in
index 2bc02e7..c51e097 100644 (file)
--- a/libftdi.spec.in
+++ b/libftdi.spec.in
@@ -47,6 +47,8 @@ rm -f $RPM_BUILD_ROOT/usr/bin/bitbang2
 rm -f $RPM_BUILD_ROOT/usr/bin/bitbang_ft2232
 rm -f $RPM_BUILD_ROOT/usr/bin/bitbang_cbus
 rm -f $RPM_BUILD_ROOT/usr/bin/find_all
+rm -f $RPM_BUILD_ROOT/usr/bin/find_all_pp
+rm -f $RPM_BUILD_ROOT/usr/bin/memorytest
 
 %clean
 rm -fr $RPM_BUILD_ROOT