13 files changed, 91 insertions, 72 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 0a3234dd62..9509dba32a 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -52,17 +52,18 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # SWIG headers get installed in ${prefix}/include/gnuradio/swig
 swiginclude_HEADERS =			\
 	gnuradio.i			\
 	gr_swig_block_magic.i		\
-	gr_shared_ptr.i                
+	gr_shared_ptr.i                	\
+	$(TOP_SWIG_DOC_IFILES)
 
 # SWIG headers that get installed in ${prefix}/include/gnuradio/swig/...
 nobase_swiginclude_HEADERS = \
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index eaf1c5371c..5c28266bea 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -231,12 +231,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio
 # This ends up at:
@@ -248,4 +248,6 @@ atsc_pythondir_category =	\
 atsc_la_swig_libadd =		\
 	libgnuradio-atsc.la
 
-
+# additional SWIG files to be installed
+atsc_swig_swiginclude_headers =  \
+	$(TOP_SWIG_DOC_IFILES)
diff --git a/gr-audio/swig/Makefile.am b/gr-audio/swig/Makefile.am
index d3aca1b32b..4aff653d65 100644
--- a/gr-audio/swig/Makefile.am
+++ b/gr-audio/swig/Makefile.am
@@ -42,12 +42,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.audio
 # This ends up at:
@@ -64,6 +64,7 @@ audio_swig_python = \
 	__init__.py
 
 # additional SWIG files to be installed
-audio_swig_swiginclude_headers =
+audio_swig_swiginclude_headers = \
+	$(TOP_SWIG_DOC_IFILES)
 
 audio_swig_swig_args = $(AUDIO_CPPFLAGS)
diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index 8aecaf335f..d6a287db52 100644
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -65,12 +65,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.comedi
 # This ends up at:
@@ -82,6 +82,10 @@ comedi_pythondir_category =	\
 comedi_la_swig_libadd =		\
 	libgnuradio-comedi.la
 
+# additional SWIG files to be installed
+comedi_swig_swiginclude_headers = \
+	$(TOP_SWIG_DOC_IFILES)
+
 if PYTHON
 TESTS += run_tests
 endif
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
index e3ee836479..f15202e72f 100644
--- a/gr-digital/swig/Makefile.am
+++ b/gr-digital/swig/Makefile.am
@@ -37,12 +37,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 if GUILE
 nobase_guile_DATA = \
 	gnuradio/digital.scm
@@ -90,7 +90,8 @@ digital_swig_swiginclude_headers =		\
 	digital_ofdm_mapper_bcv.i		\
 	digital_ofdm_sampler.i			\
 	digital_gmskmod_bc.i			\
-	digital_cpmmod_bc.i
+	digital_cpmmod_bc.i			\
+	$(TOP_SWIG_DOC_IFILES)
 
 digital_swig_swig_args = \
 	$(GR_DIGITAL_INCLUDES)
diff --git a/gr-noaa/swig/Makefile.am b/gr-noaa/swig/Makefile.am
index 786830e0cf..308bcf0836 100644
--- a/gr-noaa/swig/Makefile.am
+++ b/gr-noaa/swig/Makefile.am
@@ -51,12 +51,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.noaa
 # This ends up at:
@@ -74,9 +74,10 @@ noaa_swig_python = \
 
 # additional SWIG files to be installed
 noaa_swig_swiginclude_headers =	\
-	noaa_hrpt_decoder.i \
-	noaa_hrpt_deframer.i \
-	noaa_hrpt_pll_cf.i
+	noaa_hrpt_decoder.i 	\
+	noaa_hrpt_deframer.i 	\
+	noaa_hrpt_pll_cf.i 	\
+	$(TOP_SWIG_DOC_IFILES)
 
 if GUILE
 TESTS += run_guile_tests
diff --git a/gr-pager/swig/Makefile.am b/gr-pager/swig/Makefile.am
index 4be40a6b09..bf0b095bae 100644
--- a/gr-pager/swig/Makefile.am
+++ b/gr-pager/swig/Makefile.am
@@ -50,12 +50,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.pager
 # This ends up at:
@@ -69,11 +69,12 @@ pager_swig_la_swig_libadd = \
 
 # additional SWIG files to be installed
 pager_swig_swiginclude_headers = \
-	pager_flex_deinterleave.i \
-	pager_flex_frame.i \
-	pager_flex_parse.i \
-	pager_flex_sync.i \
-	pager_slicer_fb.i
+	pager_flex_deinterleave.i 	\
+	pager_flex_frame.i 		\
+	pager_flex_parse.i 		\
+	pager_flex_sync.i 		\
+	pager_slicer_fb.i		\
+	$(TOP_SWIG_DOC_IFILES)
 
 if GUILE
 TESTS += run_guile_tests
diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
index 9c909d22cc..64638ea2c7 100644
--- a/gr-qtgui/swig/Makefile.am
+++ b/gr-qtgui/swig/Makefile.am
@@ -45,12 +45,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.qtgui
 # This ends up at:
@@ -67,4 +67,5 @@ qtgui_swig_swiginclude_headers = 	\
 	qtgui_sink_c.i			\
 	qtgui_sink_f.i			\
 	qtgui_time_sink_c.i		\
-	qtgui_time_sink_f.i
+	qtgui_time_sink_f.i		\
+	$(TOP_SWIG_DOC_IFILES)
diff --git a/gr-shd/swig/Makefile.am b/gr-shd/swig/Makefile.am
index 8934acb4ca..04acd869e5 100644
--- a/gr-shd/swig/Makefile.am
+++ b/gr-shd/swig/Makefile.am
@@ -54,12 +54,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.shd
 # This ends up at:
@@ -76,7 +76,8 @@ shd_swig_python = \
 	__init__.py
 
 # additional SWIG files to be installed
-shd_swig_swiginclude_headers =
+shd_swig_swiginclude_headers =	\
+	$(TOP_SWIG_DOC_IFILES)
 
 shd_swig_swig_args = $(SHD_CPPFLAGS)
 
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 1482f783b9..2a86fe1961 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -130,12 +130,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.trellis
 # This ends up at:
@@ -156,7 +156,8 @@ trellis_swiginclude_headers = 		\
 	trellis_siso_f.i		\
 	trellis_siso_combined_f.i	\
 	trellis_constellation_metrics_cf.i \
-	trellis_generated.i
+	trellis_generated.i		\
+	$(TOP_SWIG_DOC_IFILES)
 
 # Do creation and inclusion of other Makefiles last
 
diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am
index da62e05527..ee868b15fe 100644
--- a/gr-uhd/swig/Makefile.am
+++ b/gr-uhd/swig/Makefile.am
@@ -54,12 +54,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.uhd
 # This ends up at:
@@ -76,7 +76,8 @@ uhd_swig_python = \
 	__init__.py
 
 # additional SWIG files to be installed
-uhd_swig_swiginclude_headers =
+uhd_swig_swiginclude_headers =	\
+	$(TOP_SWIG_DOC_IFILES)
 
 uhd_swig_swig_args = $(UHD_CPPFLAGS)
 
diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 3dd8a9208e..e52e236323 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -62,12 +62,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.video_sdl
 # This ends up at:
@@ -79,6 +79,9 @@ video_sdl_pythondir_category =		\
 video_sdl_la_swig_libadd =		\
 	libgnuradio-video-sdl.la
 
+video_sdl_swiginclude_headers =		\
+	$(TOP_SWIG_DOC_IFILES)
+
 if PYTHON
 TESTS += run_tests
 endif
diff --git a/gr-vocoder/swig/Makefile.am b/gr-vocoder/swig/Makefile.am
index e075124e34..ba806b27f4 100644
--- a/gr-vocoder/swig/Makefile.am
+++ b/gr-vocoder/swig/Makefile.am
@@ -50,12 +50,12 @@ TOP_SWIG_DOC_IFILES = \
 BUILT_SOURCES += \
 	$(TOP_SWIG_DOC_IFILES)
 
+EXTRA_DIST += \
+	$(TOP_SWIG_DOC_IFILES)
+
 $(TOP_SWIG_DOC_IFILES):
 	`echo "" > $@`
 
-install-data-local:
-	cp -p $(TOP_SWIG_DOC_IFILES) $(swigincludedir)
-
 # Install so that they end up available as:
 #   import gnuradio.vocoder
 # This ends up at:
@@ -68,23 +68,24 @@ vocoder_swig_la_swig_libadd = \
 	$(abs_top_builddir)/gr-vocoder/lib/libgnuradio-vocoder.la
 
 # additional SWIG files to be installed
-vocoder_swig_swiginclude_headers = \
-	vocoder_alaw_decode_bs.i \
-	vocoder_alaw_encode_sb.i \
-	vocoder_codec2_decode_ps.i \
-	vocoder_codec2_encode_sp.i \
-	vocoder_cvsd_decode_bs.i \
-	vocoder_cvsd_encode_sb.i \
-	vocoder_g721_decode_bs.i \
-	vocoder_g721_encode_sb.i \
-	vocoder_g723_24_decode_bs.i \
-	vocoder_g723_24_encode_sb.i \
-	vocoder_g723_40_decode_bs.i \
-	vocoder_g723_40_encode_sb.i \
-	vocoder_gsm_fr_encode_sp.i \
-	vocoder_gsm_fr_decode_ps.i \
-	vocoder_ulaw_decode_bs.i \
-	vocoder_ulaw_encode_sb.i
+vocoder_swig_swiginclude_headers = 	\
+	vocoder_alaw_decode_bs.i 	\
+	vocoder_alaw_encode_sb.i 	\
+	vocoder_codec2_decode_ps.i 	\
+	vocoder_codec2_encode_sp.i 	\
+	vocoder_cvsd_decode_bs.i 	\
+	vocoder_cvsd_encode_sb.i 	\
+	vocoder_g721_decode_bs.i 	\
+	vocoder_g721_encode_sb.i 	\
+	vocoder_g723_24_decode_bs.i 	\
+	vocoder_g723_24_encode_sb.i 	\
+	vocoder_g723_40_decode_bs.i 	\
+	vocoder_g723_40_encode_sb.i 	\
+	vocoder_gsm_fr_encode_sp.i 	\
+	vocoder_gsm_fr_decode_ps.i 	\
+	vocoder_ulaw_decode_bs.i 	\
+	vocoder_ulaw_encode_sb.i	\
+	$(TOP_SWIG_DOC_IFILE)
 
 vocoder_swig_swig_args = \
 	-I$(abs_top_builddir)/gr-vocoder/lib