From 75f3bce02ed8ec7e7be27dc6a397be92cb663ce6 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 17 Nov 2010 18:52:05 -0800
Subject: Keep doxygen 1.7.1 from crashing.

---
 docs/doxygen/Doxyfile.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'docs')

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 
-- 
cgit 


From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 17:29:11 -0800
Subject: Major Makefile.am housecleaning.  Passes distcheck.

Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
---
 docs/doxygen/other/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/doxygen/other/Makefile.am b/docs/doxygen/other/Makefile.am
index eb5f170af..82ee0f945 100644
--- a/docs/doxygen/other/Makefile.am
+++ b/docs/doxygen/other/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	doxypy.py \
 	group_defs.dox \
 	shared_ptr_docstub.h \
-- 
cgit