From 57f1f769e5e5bb07a5385955eee9390d0e1de908 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 5 Apr 2010 17:55:13 -0700
Subject: some doxygen fixes after merge

---
 host/CMakeLists.txt                    | 2 +-
 host/Doxyfile.in                       | 2 +-
 host/include/uhd/types/device_addr.hpp | 2 +-
 host/include/uhd/types/dict.hpp        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'host')

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 44dc74f8c..d2889fe58 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -138,7 +138,7 @@ IF(DOXYGEN_FOUND)
         COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
         COMMENT "Generating documentation with doxygen"
     )
-    ADD_CUSTOM_TARGET(doxygen_docs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR_DOXYGEN})
+    ADD_CUSTOM_TARGET(docs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR_DOXYGEN})
     INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR_DOXYGEN} DESTINATION ${PKG_DOC_DIR})
 ENDIF(DOXYGEN_FOUND)
 
diff --git a/host/Doxyfile.in b/host/Doxyfile.in
index a5a14ac0b..7395516b5 100644
--- a/host/Doxyfile.in
+++ b/host/Doxyfile.in
@@ -1223,7 +1223,7 @@ ENABLE_PREPROCESSING   = YES
 # compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
 # then the macro expansion is limited to the macros specified with the
diff --git a/host/include/uhd/types/device_addr.hpp b/host/include/uhd/types/device_addr.hpp
index 1162884fb..f5dd9371c 100644
--- a/host/include/uhd/types/device_addr.hpp
+++ b/host/include/uhd/types/device_addr.hpp
@@ -32,7 +32,7 @@ namespace uhd{
      *
      * To narrow down the discovery process to a particular device,
      * specify a transport key/value pair specific to your device.
-     * Ex, to find a usrp2: my_dev_addr["addr"] = <resolvable_hostname_or_ip>
+     * Ex, to find a usrp2: my_dev_addr["addr"] = [resolvable_hostname_or_ip]
      *
      * The device address can also be used to pass arguments into
      * the transport layer control to set (for example) buffer sizes.
diff --git a/host/include/uhd/types/dict.hpp b/host/include/uhd/types/dict.hpp
index 7fb712e76..22f702575 100644
--- a/host/include/uhd/types/dict.hpp
+++ b/host/include/uhd/types/dict.hpp
@@ -62,7 +62,7 @@ namespace uhd{
 
         /*!
          * Get the number of elements in this dict.
-         * \param the number of elements
+         * \return the number of elements
          */
         std::size_t size(void) const{
             return _map.size();
-- 
cgit v1.2.3