diff options
| author | Eric Blossom | 2010-11-17 19:00:12 -0800 |
|---|---|---|
| committer | Eric Blossom | 2010-11-17 19:00:12 -0800 |
| commit | 9edc59fc7cff2321c87042733c0bf29115fb34ee (patch) | |
| tree | d9da7a61eef67c6d9a67cbd3a0d94c850fba76bc /docs/doxygen | |
| parent | 6129a67cf6527a0f0dc8b83df108c4fe2147155b (diff) | |
| parent | 3f56b10b5eaef36643fd87044601ca47cd9fb707 (diff) | |
| download | gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.tar.gz gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.tar.bz2 gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.zip | |
Merge remote branch 'gnuradio.org/next' into test
* gnuradio.org/next:
distcheck fix for gr-uhd
Keep doxygen 1.7.1 from crashing.
uhd: swig changes for templated ranges
Diffstat (limited to 'docs/doxygen')
| -rw-r--r-- | docs/doxygen/Doxyfile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index 243fa00bf..f12dd61b7 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -587,7 +587,7 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/docs/doxygen/xml-swig \ @abs_top_builddir@/docs/doxygen/other/doxypy.py \ @abs_top_builddir@/dtools \ - @abs_top_builddir@/gcell/ibm \ + @abs_top_srcdir@/gcell/ibm \ @abs_top_builddir@/gnuradio-core/src/lib/bug_work_around_6.cc \ @abs_top_builddir@/gnuradio-core/src/lib/filter/assembly.h \ @abs_top_builddir@/gnuradio-core/src/lib/filter/generate_all.py \ @@ -666,7 +666,9 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/usrp/host/misc \ @abs_top_builddir@/usrp/host/swig \ @abs_top_builddir@/usrp2/firmware \ - @abs_top_builddir@/usrp2/fpga + @abs_top_srcdir@/usrp2/firmware \ + @abs_top_builddir@/usrp2/fpga \ + @abs_top_srcdir@/usrp2/fpga # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded |