Deal with newer gnuradio and doxygen. Also use xmlto for the main document.

2 files changed, 52 insertions, 46 deletions

diff --git a/ham/usrp-docs/Makefile b/ham/usrp-docs/Makefile
index cf5b27c1bdf..e4ef048f1d5 100644
--- a/ham/usrp-docs/Makefile
+++ b/ham/usrp-docs/Makefile
@@ -1,21 +1,27 @@
-# $NetBSD: Makefile,v 1.6 2009/08/12 12:21:41 markd Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/07 17:06:13 joerg Exp $
 
 PKGNAME=	usrp-docs-${VERSION}
 COMMENT=	Documentation for the usrp module
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../meta-pkgs/gnuradio/Makefile.common"
 
 USE_TOOLS+=	make
 CONFIGURE_ARGS+=--enable-doxygen
 CONFIGURE_ARGS+=--docdir=${LOCALBASE}/share/doc/gnuradio/usrp
 
-BUILD_DEPENDS+=	doxygen>=1.5.7.1:../../devel/doxygen
+BUILD_DEPENDS+=	doxygen>=1.6.1:../../devel/doxygen
+BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+
+BUILD_DIRS=	usrp/doc
 
-do-build:
-	cd ${WRKSRC}/usrp/doc && make
+DOCDIR=		${PREFIX}/share/doc/usrp-${PKGVERSION_NOREV}
+INSTALLATION_DIRS=	${DOCDIR}
 
 do-install:
-	cd ${WRKSRC}/usrp/doc && make install
+	cp -r ${WRKSRC}/usrp/doc/html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/usrp/doc/usrp_guide.html ${DESTDIR}${DOCDIR}/html
 
 .include "../../ham/usrp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/usrp-docs/PLIST b/ham/usrp-docs/PLIST
index 7cda567674c..8d4bc7d287b 100644
--- a/ham/usrp-docs/PLIST
+++ b/ham/usrp-docs/PLIST
@@ -1,17 +1,15 @@
-@comment $NetBSD: PLIST,v 1.7 2009/08/12 12:21:41 markd Exp $
-share/doc/usrp-${PKGVERSION}/README
-share/doc/usrp-${PKGVERSION}/html/ad9862_8h-source.html
+@comment $NetBSD: PLIST,v 1.8 2009/10/07 17:06:13 joerg Exp $
 share/doc/usrp-${PKGVERSION}/html/ad9862_8h.html
 share/doc/usrp-${PKGVERSION}/html/ad9862_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/ad9862_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/ad9862_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/ad9862_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/annotated.html
 share/doc/usrp-${PKGVERSION}/html/bug__work__around__8_8cc.html
 share/doc/usrp-${PKGVERSION}/html/check__order__quickly_8cc.html
 share/doc/usrp-${PKGVERSION}/html/check__order__quickly_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/check__order__quickly_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/check__order__quickly_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h.html
 share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h__dep__incl.md5
@@ -19,7 +17,7 @@ share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/circular__buffer_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h.html
 share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h__dep__incl.md5
@@ -27,6 +25,7 @@ share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/circular__linked__list_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/class__1200__common-members.html
 share/doc/usrp-${PKGVERSION}/html/class__1200__common.html
 share/doc/usrp-${PKGVERSION}/html/class__1200__common__coll__graph.map
@@ -699,7 +698,6 @@ share/doc/usrp-${PKGVERSION}/html/classxcvr2450.html
 share/doc/usrp-${PKGVERSION}/html/classxcvr2450__coll__graph.map
 share/doc/usrp-${PKGVERSION}/html/classxcvr2450__coll__graph.md5
 share/doc/usrp-${PKGVERSION}/html/classxcvr2450__coll__graph.png
-share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h.html
 share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__dep__incl.md5
@@ -707,11 +705,11 @@ share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__base_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__base_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__base_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__base_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__base_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__base_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__base_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__base_8h__dep__incl.md5
@@ -719,7 +717,7 @@ share/doc/usrp-${PKGVERSION}/html/db__base_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__base_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__base_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__base_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/db__base_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h__dep__incl.md5
@@ -727,11 +725,11 @@ share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__base__impl_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__basic_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__basic_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__basic_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__basic_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__basic_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h__dep__incl.md5
@@ -739,11 +737,11 @@ share/doc/usrp-${PKGVERSION}/html/db__basic_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__basic_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__boards_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__boards_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__boards_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__boards_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__boards_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__boards_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__boards_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__boards_8h__dep__incl.md5
@@ -751,11 +749,11 @@ share/doc/usrp-${PKGVERSION}/html/db__boards_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__boards_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__boards_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__boards_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__boards_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h__dep__incl.md5
@@ -763,11 +761,11 @@ share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__dbs__rx_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h__dep__incl.md5
@@ -775,11 +773,11 @@ share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__dtt754_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h__dep__incl.md5
@@ -787,11 +785,11 @@ share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__dtt768_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h__dep__incl.md5
@@ -799,11 +797,11 @@ share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__flexrf_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h__dep__incl.md5
@@ -811,11 +809,11 @@ share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__flexrf__mimo_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__dep__incl.md5
@@ -823,11 +821,11 @@ share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__util_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__util_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__util_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__util_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__util_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__util_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__util_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__util_8h__dep__incl.md5
@@ -835,7 +833,7 @@ share/doc/usrp-${PKGVERSION}/html/db__util_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__util_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__util_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__util_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/db__util_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__wbx_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__dep__incl.md5
@@ -843,11 +841,11 @@ share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbx_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h.html
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h__dep__incl.md5
@@ -855,6 +853,7 @@ share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/doxygen.css
 share/doc/usrp-${PKGVERSION}/html/doxygen.png
 share/doc/usrp-${PKGVERSION}/html/files.html
@@ -912,16 +911,15 @@ share/doc/usrp-${PKGVERSION}/html/fusb_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/fusb_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/fusb_8h.html
 share/doc/usrp-${PKGVERSION}/html/fusb_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h.html
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h__dep__incl.md5
@@ -929,11 +927,11 @@ share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h.html
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__dep__incl.md5
@@ -941,11 +939,11 @@ share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h.html
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h__dep__incl.md5
@@ -953,11 +951,11 @@ share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb__linux_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h.html
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h__dep__incl.md5
@@ -965,6 +963,7 @@ share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb__ra__wb_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__darwin_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__darwin_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__darwin_8cc__incl.md5
@@ -989,7 +988,6 @@ share/doc/usrp-${PKGVERSION}/html/fusb__win32_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h.html
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h__dep__incl.md5
@@ -997,11 +995,12 @@ share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/getopt_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/fusb__win32_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/getopt_8h.html
 share/doc/usrp-${PKGVERSION}/html/getopt_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/getopt_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/getopt_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/getopt_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/globals.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x61.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x62.html
@@ -1119,7 +1118,6 @@ share/doc/usrp-${PKGVERSION}/html/inherit__graph__9.md5
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__9.png
 share/doc/usrp-${PKGVERSION}/html/inherits.html
 share/doc/usrp-${PKGVERSION}/html/mainpage_8dox.html
-share/doc/usrp-${PKGVERSION}/html/md5_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/md5_8h.html
 share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.md5
@@ -1127,7 +1125,7 @@ share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/md5_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/mld__threads_8h.html
 share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__dep__incl.md5
@@ -1135,13 +1133,14 @@ share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/rate__to__regval_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/mld__threads_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/rate__to__regval_8h.html
-share/doc/usrp-${PKGVERSION}/html/std__paths_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/rate__to__regval_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/std__paths_8h.html
 share/doc/usrp-${PKGVERSION}/html/std__paths_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/std__paths_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/std__paths_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/std__paths_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/structdarwin__dev__handle-members.html
 share/doc/usrp-${PKGVERSION}/html/structdarwin__dev__handle.html
 share/doc/usrp-${PKGVERSION}/html/structfreq__result__t-members.html
@@ -1175,16 +1174,15 @@ share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__tx_8cc.html
 share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__tx_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__tx_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__tx_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/time__stuff_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/time__stuff_8h.html
 share/doc/usrp-${PKGVERSION}/html/time__stuff_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/time__stuff_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/time__stuff_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/time__stuff_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc.html
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h__dep__incl.md5
@@ -1192,11 +1190,12 @@ share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__bytesex_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/usrp__basic_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__bytesex_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__bytesex_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__bytesex_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__bytesex_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__bytesex_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__cal__dc__offset_8cc.html
 share/doc/usrp-${PKGVERSION}/html/usrp__cal__dc__offset_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__cal__dc__offset_8cc__incl.md5
@@ -1205,25 +1204,24 @@ share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc.html
 share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__config_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__config_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__config_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__config_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__config_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__config_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8cc.html
 share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8cc.html
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__dep__incl.md5
@@ -1231,11 +1229,11 @@ share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc.html
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__dep__incl.md5
@@ -1243,16 +1241,16 @@ share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8cc.html
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8cc__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h-source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h__dep__incl.md5
@@ -1260,16 +1258,18 @@ share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__subdev__spec_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/usrp__standard_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__subdev__spec_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__subdev__spec_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__subdev__spec_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__subdev__spec_8h__dep__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__tune__result_8h-source.html
+share/doc/usrp-${PKGVERSION}/html/usrp__subdev__spec_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__tune__result_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__tune__result_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__tune__result_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__tune__result_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__tune__result_8h_source.html
+share/doc/usrp-${PKGVERSION}/html/usrp_guide.html
 share/doc/usrp-${PKGVERSION}/html/usrper_8cc.html
 share/doc/usrp-${PKGVERSION}/html/usrper_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrper_8cc__incl.md5