From 224bc6a088ef431650a5b2564371ea584bfc2092 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Tue, 21 Oct 2008 22:58:37 +0200 Subject: [PATCH] Removed examples/memorytest.cpp - it's more like a unit test than a example --- examples/CMakeLists.txt | 2 -- examples/Makefile.am | 5 +---- examples/memorytest.cpp | 28 ---------------------------- libftdi.spec.in | 1 - 4 files changed, 1 insertions(+), 35 deletions(-) delete mode 100644 examples/memorytest.cpp diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index c333678..04c0497 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -29,9 +29,7 @@ if(FTDI_BUILD_CPP) # Targest add_executable(find_all_pp find_all_pp.cpp) - add_executable(memorytest memorytest.cpp) # Linkage target_link_libraries(find_all_pp ftdi_cpp) - target_link_libraries(memorytest ftdi_cpp) endif() diff --git a/examples/Makefile.am b/examples/Makefile.am index bd57253..02e7f23 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -4,8 +4,7 @@ LDADD = $(top_builddir)/src/libftdi.la if HAVE_LIBFTDIPP -examples_libftdipp = find_all_pp \ - memorytest +examples_libftdipp = find_all_pp else examples_libftdipp = endif @@ -32,6 +31,4 @@ 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/memorytest.cpp b/examples/memorytest.cpp deleted file mode 100644 index 1cb57e4..0000000 --- a/examples/memorytest.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* cpp-simple.cpp - - Simple libftdi-cpp usage - - This program is distributed under the GPL, version 2 -*/ - -#include "ftdi.hpp" -#include -using namespace Ftdi; - -int main(int argc, char **argv) -{ - std::cerr << "Creating ct context" << std::endl; - Context ct; - { - std::cerr << "Copying ct2 context" << std::endl; - Context ct2 = ct; - } - - std::cerr << "Copying ct3 context" << std::endl; - Context ct3(ct); - - std::cerr << "Result: " << ct.vendor() << std::endl; - - return 0; -} - diff --git a/libftdi.spec.in b/libftdi.spec.in index c51e097..2c4705f 100644 --- a/libftdi.spec.in +++ b/libftdi.spec.in @@ -48,7 +48,6 @@ 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 -- 1.7.1