Reorganized apps dir into utils and examples dir.

The files get installed into the pkg data directory.

12 files changed, 38 insertions, 12 deletions

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 2f5d03f7d..148ba2d00 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -34,8 +34,9 @@ INCLUDE(CPack) #include after setting vars
 ########################################################################
 SET(RUNTIME_DIR bin)
 SET(LIBRARY_DIR lib)
-SET(RESOURCE_DIR share)
-SET(HEADER_DIR include)
+SET(INCLUDE_DIR include)
+SET(PKG_DATA_DIR share/uhd)
+MESSAGE(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}")
 
 ########################################################################
 # Local Include Dir
@@ -74,7 +75,7 @@ ENDIF(WIN32)
 # Setup Boost
 ########################################################################
 SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42")
-FIND_PACKAGE(Boost 1.36 REQUIRED
+FIND_PACKAGE(Boost 1.36 REQUIRED COMPONENTS
     date_time
     filesystem
     program_options
@@ -126,7 +127,8 @@ INSTALL(
 ########################################################################
 # Add the subdirectories
 ########################################################################
-ADD_SUBDIRECTORY(apps)
+ADD_SUBDIRECTORY(examples)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(lib)
 ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(utils)
diff --git a/host/README b/host/README
index f19275c41..cdca42cd0 100644
--- a/host/README
+++ b/host/README
@@ -6,21 +6,25 @@ The hardware driver for Ettus Research products.
 ########################################################################
 # Supported USRP Motherboards
 ########################################################################
-USRP2 - gigabit ethernet
+USRP2 - udp over gigabit ethernet
 
 ########################################################################
 # Supported USRP Daughterboards
 ########################################################################
 Basic RX
 Basic TX
+LF RX
+LF TX
 
 ########################################################################
 # CMake Instructions
 ########################################################################
-cd <uhd_src_dir>
+cd uhd/host
 mkdir build
 cd build
 cmake ../
 make
 make test
 sudo make install
+
+For a custom prefix, use: cmake -DCMAKE_INSTALL_PREFIX=<myprefix> ../
diff --git a/host/examples/CMakeLists.txt b/host/examples/CMakeLists.txt
new file mode 100644
index 000000000..242857625
--- /dev/null
+++ b/host/examples/CMakeLists.txt
@@ -0,0 +1,20 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+ADD_EXECUTABLE(rx_timed_samples rx_timed_samples.cpp)
+TARGET_LINK_LIBRARIES(rx_timed_samples uhd)
+INSTALL(TARGETS rx_timed_samples RUNTIME DESTINATION ${PKG_DATA_DIR}/examples)
diff --git a/host/apps/uhd_rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index 97f75647e..97f75647e 100644
--- a/host/apps/uhd_rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt
index 3d00462cf..84e7b441b 100644
--- a/host/include/uhd/CMakeLists.txt
+++ b/host/include/uhd/CMakeLists.txt
@@ -32,5 +32,5 @@ INSTALL(FILES
     types.hpp
     utils.hpp
     wax.hpp
-    DESTINATION ${HEADER_DIR}/uhd
+    DESTINATION ${INCLUDE_DIR}/uhd
 )
diff --git a/host/include/uhd/transport/CMakeLists.txt b/host/include/uhd/transport/CMakeLists.txt
index 7f5db2128..75b07c540 100644
--- a/host/include/uhd/transport/CMakeLists.txt
+++ b/host/include/uhd/transport/CMakeLists.txt
@@ -21,5 +21,5 @@ INSTALL(FILES
     udp_simple.hpp
     udp_zero_copy.hpp
     vrt.hpp
-    DESTINATION ${HEADER_DIR}/uhd/transport
+    DESTINATION ${INCLUDE_DIR}/uhd/transport
 )
diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt
index 4e0a92365..bab01fdeb 100644
--- a/host/include/uhd/usrp/CMakeLists.txt
+++ b/host/include/uhd/usrp/CMakeLists.txt
@@ -23,5 +23,5 @@ INSTALL(FILES
     dboard_manager.hpp
     usrp1e.hpp
     usrp2.hpp
-    DESTINATION ${HEADER_DIR}/uhd/usrp
+    DESTINATION ${INCLUDE_DIR}/uhd/usrp
 )
diff --git a/host/uhd.pc.in b/host/uhd.pc.in
index 59ba623f5..2a34e9cfd 100644
--- a/host/uhd.pc.in
+++ b/host/uhd.pc.in
@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${prefix}/@LIBRARY_DIR@
-includedir=${prefix}/@HEADER_DIR@
+includedir=${prefix}/@INCLUDE_DIR@
 
 Name: @CPACK_PACKAGE_NAME@
 Description: Universal Hardware Driver
diff --git a/host/apps/CMakeLists.txt b/host/utils/CMakeLists.txt
index f31206e1a..9ac3f3a52 100644
--- a/host/apps/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -21,6 +21,6 @@ INSTALL(TARGETS discover_usrps RUNTIME DESTINATION ${RUNTIME_DIR})
 
 ADD_EXECUTABLE(usrp2_burner usrp2_burner.cpp)
 TARGET_LINK_LIBRARIES(usrp2_burner uhd)
+INSTALL(TARGETS usrp2_burner RUNTIME DESTINATION ${PKG_DATA_DIR}/utils)
 
-ADD_EXECUTABLE(uhd_rx_timed_samples uhd_rx_timed_samples.cpp)
-TARGET_LINK_LIBRARIES(uhd_rx_timed_samples uhd)
+INSTALL(FILES usrp2_recovery.py DESTINATION ${PKG_DATA_DIR}/utils)
diff --git a/host/apps/discover_usrps.cpp b/host/utils/discover_usrps.cpp
index d670d1651..d670d1651 100644
--- a/host/apps/discover_usrps.cpp
+++ b/host/utils/discover_usrps.cpp
diff --git a/host/apps/usrp2_burner.cpp b/host/utils/usrp2_burner.cpp
index 941e71d0c..941e71d0c 100644
--- a/host/apps/usrp2_burner.cpp
+++ b/host/utils/usrp2_burner.cpp
diff --git a/host/apps/usrp2_recovery.py b/host/utils/usrp2_recovery.py
index 48c1121cb..48c1121cb 100755
--- a/host/apps/usrp2_recovery.py
+++ b/host/utils/usrp2_recovery.py