Merge branch 'maint'

Conflicts:
	gruel/src/swig/CMakeLists.txt

22 files changed, 74 insertions, 412 deletions

diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
index dcdd5a066..175d0d759 100644
--- a/cmake/Modules/GrSwig.cmake
+++ b/cmake/Modules/GrSwig.cmake
@@ -105,12 +105,15 @@ endfunction(GR_SWIG_MAKE_DOCS)
 macro(GR_SWIG_MAKE name)
     set(ifiles ${ARGN})
 
+    list(APPEND GR_SWIG_TARGET_DEPS ${GR_SWIG_LIBRARIES})
+
     #do swig doc generation if specified
     if (GR_SWIG_DOC_FILE)
         set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS})
         set(GR_SWIG_DOCS_TAREGT_DEPS ${GR_SWIG_TARGET_DEPS})
         GR_SWIG_MAKE_DOCS(${GR_SWIG_DOC_FILE} ${GR_SWIG_DOC_DIRS})
-        list(APPEND GR_SWIG_SOURCE_DEPS ${GR_SWIG_DOC_FILE})
+        add_custom_target(${name}_swig_doc DEPENDS ${GR_SWIG_DOC_FILE})
+        list(APPEND GR_SWIG_TARGET_DEPS ${name}_swig_doc)
     endif()
 
     #append additional include directories
diff --git a/docs/doxygen/swig_doc.py b/docs/doxygen/swig_doc.py
index 927747098..f24608b3e 100644
--- a/docs/doxygen/swig_doc.py
+++ b/docs/doxygen/swig_doc.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2010,2011 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -232,25 +232,7 @@ def make_block2_entry(di, block):
             params=make_func.params))
     return "\n\n".join(output)
 
-def wait_if_necessary(tries, swigdocfilename, item=None):
-    if item is not None:
-        extra = ', item {0}'.format(item.name())
-    else:
-        extra = ''
-    if(tries < 3):
-        # May not be built just yet; sleep and try again
-        sys.stderr.write("XML parsing problem with file {0}{1}, retrying.\n".format(
-                swigdocfilename, extra))
-        time.sleep(1)
-        tries += 1
-        return tries, True
-    else:
-        # if we've given it three tries, give up and raise an error
-        sys.stderr.write("XML parsing error with file {0}{1}. giving up.\n".format(
-                swigdocfilename, extra))
-        return tries, False
-
-def make_swig_interface_file(di, swigdocfilename, custom_output=None, tries=0):
+def make_swig_interface_file(di, swigdocfilename, custom_output=None):
     
     output = ["""
 /*
@@ -264,50 +246,32 @@ def make_swig_interface_file(di, swigdocfilename, custom_output=None, tries=0):
         output.append(custom_output)
 
     # Create docstrings for the blocks.
-    while(1):
-        try:
-            blocks = di.in_category(Block)
-            blocks2 = di.in_category(Block2)
-        except:
-            tries, try_again = wait_if_necessary(tries, swigdocfilename)
-            if not try_again:
-                raise
-        else:
-            break
+    blocks = di.in_category(Block)
+    blocks2 = di.in_category(Block2)
+
     make_funcs = set([])
     for block in blocks:
-        while(1):
-            try:
-                make_func = di.get_member(make_name(block.name()), DoxyFunction)
-                # Don't want to risk writing to output twice.
-                if make_func.name() not in make_funcs:
-                    make_funcs.add(make_func.name())
-                    output.append(make_block_entry(di, block))
-            except block.ParsingError:
-                sys.stderr.write('Parsing error for block {0}\n'.format(block.name()))
-            except:
-                tries, try_again = wait_if_necessary(tries, swigdocfilename, block)
-                if not try_again:
-                    raise
-            else:
-                break
+        try:
+            make_func = di.get_member(make_name(block.name()), DoxyFunction)
+            # Don't want to risk writing to output twice.
+            if make_func.name() not in make_funcs:
+                make_funcs.add(make_func.name())
+                output.append(make_block_entry(di, block))
+        except block.ParsingError:
+            sys.stderr.write('Parsing error for block {0}\n'.format(block.name()))
+            raise
+
     for block in blocks2:
-        while(1):
-            try:
-                make_func = block.get_member('make', DoxyFunction)
-                make_func_name = block.name() +'::make'
-                # Don't want to risk writing to output twice.
-                if make_func_name not in make_funcs:
-                    make_funcs.add(make_func_name)
-                    output.append(make_block2_entry(di, block))
-            except block.ParsingError:
-                sys.stderr.write('Parsing error for block {0}\n'.format(block.name()))
-            except:
-                tries, try_again = wait_if_necessary(tries, swigdocfilename, block)
-                if not try_again:
-                    raise
-            else:
-                break        
+        try:
+            make_func = block.get_member('make', DoxyFunction)
+            make_func_name = block.name() +'::make'
+            # Don't want to risk writing to output twice.
+            if make_func_name not in make_funcs:
+                make_funcs.add(make_func_name)
+                output.append(make_block2_entry(di, block))
+        except block.ParsingError:
+            sys.stderr.write('Parsing error for block {0}\n'.format(block.name()))
+            raise
 
     # Create docstrings for functions
     # Don't include the make functions since they have already been dealt with.
@@ -359,16 +323,4 @@ if __name__ == "__main__":
     custom_output = "\n\n".join(output)
 
     # Generate the docstrings interface file.
-    # If parsing error on NoSuchMember, try again by rereading everything.
-    # Give up after 3 tries.
-    tries = 0
-    while(1):
-        try:
-            make_swig_interface_file(di, swigdocfilename, custom_output=custom_output, tries=tries)
-        except:
-            tries, try_again = wait_if_necessary(tries, swigdocfilename)
-            if not try_again:
-                raise
-        else:
-            break
-        
+    make_swig_interface_file(di, swigdocfilename, custom_output=custom_output)
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index f521bdf68..53cb16d38 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -37,6 +37,10 @@ ADD_FILE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.cc
     ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
 )
 
+add_custom_target(general_generated DEPENDS
+    ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
+)
+
 ########################################################################
 # Handle the generated constants
 ########################################################################
diff --git a/gnuradio-core/src/lib/gengen/Makefile.gen b/gnuradio-core/src/lib/gengen/Makefile.gen
deleted file mode 100644
index b4a255dc0..000000000
--- a/gnuradio-core/src/lib/gengen/Makefile.gen
+++ /dev/null
@@ -1,333 +0,0 @@
-#
-# This file is machine generated.  All edits will be overwritten
-#
-GENERATED_H = \
-	gr_add_cc.h \
-	gr_add_const_cc.h \
-	gr_add_const_ff.h \
-	gr_add_const_ii.h \
-	gr_add_const_sf.h \
-	gr_add_const_ss.h \
-	gr_add_const_vcc.h \
-	gr_add_const_vff.h \
-	gr_add_const_vii.h \
-	gr_add_const_vss.h \
-	gr_add_ii.h \
-	gr_add_ss.h \
-	gr_and_bb.h \
-	gr_and_const_bb.h \
-	gr_and_const_ii.h \
-	gr_and_const_ss.h \
-	gr_and_ii.h \
-	gr_and_ss.h \
-	gr_argmax_fs.h \
-	gr_argmax_is.h \
-	gr_argmax_ss.h \
-	gr_chunks_to_symbols_bc.h \
-	gr_chunks_to_symbols_bf.h \
-	gr_chunks_to_symbols_ic.h \
-	gr_chunks_to_symbols_if.h \
-	gr_chunks_to_symbols_sc.h \
-	gr_chunks_to_symbols_sf.h \
-	gr_divide_cc.h \
-	gr_divide_ff.h \
-	gr_divide_ii.h \
-	gr_divide_ss.h \
-	gr_integrate_cc.h \
-	gr_integrate_ff.h \
-	gr_integrate_ii.h \
-	gr_integrate_ss.h \
-	gr_max_ff.h \
-	gr_max_ii.h \
-	gr_max_ss.h \
-	gr_moving_average_cc.h \
-	gr_moving_average_ff.h \
-	gr_moving_average_ii.h \
-	gr_moving_average_ss.h \
-	gr_multiply_const_ii.h \
-	gr_multiply_const_ss.h \
-	gr_multiply_const_vcc.h \
-	gr_multiply_const_vff.h \
-	gr_multiply_const_vii.h \
-	gr_multiply_const_vss.h \
-	gr_multiply_ii.h \
-	gr_multiply_ss.h \
-	gr_mute_cc.h \
-	gr_mute_ff.h \
-	gr_mute_ii.h \
-	gr_mute_ss.h \
-	gr_noise_source_c.h \
-	gr_noise_source_f.h \
-	gr_noise_source_i.h \
-	gr_noise_source_s.h \
-	gr_not_bb.h \
-	gr_not_ii.h \
-	gr_not_ss.h \
-	gr_or_bb.h \
-	gr_or_ii.h \
-	gr_or_ss.h \
-	gr_packed_to_unpacked_bb.h \
-	gr_packed_to_unpacked_ii.h \
-	gr_packed_to_unpacked_ss.h \
-	gr_peak_detector_fb.h \
-	gr_peak_detector_ib.h \
-	gr_peak_detector_sb.h \
-	gr_probe_signal_b.h \
-	gr_probe_signal_s.h \
-	gr_probe_signal_i.h \
-	gr_probe_signal_f.h \
-	gr_probe_signal_c.h \
-	gr_probe_signal_vb.h \
-	gr_probe_signal_vs.h \
-	gr_probe_signal_vi.h \
-	gr_probe_signal_vf.h \
-	gr_probe_signal_vc.h \
-	gr_sample_and_hold_bb.h \
-	gr_sample_and_hold_ff.h \
-	gr_sample_and_hold_ii.h \
-	gr_sample_and_hold_ss.h \
-	gr_sig_source_c.h \
-	gr_sig_source_f.h \
-	gr_sig_source_i.h \
-	gr_sig_source_s.h \
-	gr_sub_cc.h \
-	gr_sub_ff.h \
-	gr_sub_ii.h \
-	gr_sub_ss.h \
-	gr_unpacked_to_packed_bb.h \
-	gr_unpacked_to_packed_ii.h \
-	gr_unpacked_to_packed_ss.h \
-	gr_vector_sink_b.h \
-	gr_vector_sink_c.h \
-	gr_vector_sink_f.h \
-	gr_vector_sink_i.h \
-	gr_vector_sink_s.h \
-	gr_vector_source_b.h \
-	gr_vector_source_c.h \
-	gr_vector_source_f.h \
-	gr_vector_source_i.h \
-	gr_vector_source_s.h \
-	gr_xor_bb.h \
-	gr_xor_ii.h \
-	gr_xor_ss.h
-
-GENERATED_I = \
-	gr_add_cc.i \
-	gr_add_const_cc.i \
-	gr_add_const_ff.i \
-	gr_add_const_ii.i \
-	gr_add_const_sf.i \
-	gr_add_const_ss.i \
-	gr_add_const_vcc.i \
-	gr_add_const_vff.i \
-	gr_add_const_vii.i \
-	gr_add_const_vss.i \
-	gr_add_ii.i \
-	gr_add_ss.i \
-	gr_and_bb.i \
-	gr_and_const_bb.i \
-	gr_and_const_ii.i \
-	gr_and_const_ss.i \
-	gr_and_ii.i \
-	gr_and_ss.i \
-	gr_argmax_fs.i \
-	gr_argmax_is.i \
-	gr_argmax_ss.i \
-	gr_chunks_to_symbols_bc.i \
-	gr_chunks_to_symbols_bf.i \
-	gr_chunks_to_symbols_ic.i \
-	gr_chunks_to_symbols_if.i \
-	gr_chunks_to_symbols_sc.i \
-	gr_chunks_to_symbols_sf.i \
-	gr_divide_cc.i \
-	gr_divide_ff.i \
-	gr_divide_ii.i \
-	gr_divide_ss.i \
-	gr_integrate_cc.i \
-	gr_integrate_ff.i \
-	gr_integrate_ii.i \
-	gr_integrate_ss.i \
-	gr_max_ff.i \
-	gr_max_ii.i \
-	gr_max_ss.i \
-	gr_moving_average_cc.i \
-	gr_moving_average_ff.i \
-	gr_moving_average_ii.i \
-	gr_moving_average_ss.i \
-	gr_multiply_const_ii.i \
-	gr_multiply_const_ss.i \
-	gr_multiply_const_vcc.i \
-	gr_multiply_const_vff.i \
-	gr_multiply_const_vii.i \
-	gr_multiply_const_vss.i \
-	gr_multiply_ii.i \
-	gr_multiply_ss.i \
-	gr_mute_cc.i \
-	gr_mute_ff.i \
-	gr_mute_ii.i \
-	gr_mute_ss.i \
-	gr_noise_source_c.i \
-	gr_noise_source_f.i \
-	gr_noise_source_i.i \
-	gr_noise_source_s.i \
-	gr_not_bb.i \
-	gr_not_ii.i \
-	gr_not_ss.i \
-	gr_or_bb.i \
-	gr_or_ii.i \
-	gr_or_ss.i \
-	gr_packed_to_unpacked_bb.i \
-	gr_packed_to_unpacked_ii.i \
-	gr_packed_to_unpacked_ss.i \
-	gr_peak_detector_fb.i \
-	gr_peak_detector_ib.i \
-	gr_peak_detector_sb.i \
-	gr_probe_signal_b.i \
-	gr_probe_signal_s.i \
-	gr_probe_signal_i.i \
-	gr_probe_signal_f.i \
-	gr_probe_signal_c.i \
-	gr_probe_signal_vb.i \
-	gr_probe_signal_vs.i \
-	gr_probe_signal_vi.i \
-	gr_probe_signal_vf.i \
-	gr_probe_signal_vc.i \
-	gr_sample_and_hold_bb.i \
-	gr_sample_and_hold_ff.i \
-	gr_sample_and_hold_ii.i \
-	gr_sample_and_hold_ss.i \
-	gr_sig_source_c.i \
-	gr_sig_source_f.i \
-	gr_sig_source_i.i \
-	gr_sig_source_s.i \
-	gr_sub_cc.i \
-	gr_sub_ff.i \
-	gr_sub_ii.i \
-	gr_sub_ss.i \
-	gr_unpacked_to_packed_bb.i \
-	gr_unpacked_to_packed_ii.i \
-	gr_unpacked_to_packed_ss.i \
-	gr_vector_sink_b.i \
-	gr_vector_sink_c.i \
-	gr_vector_sink_f.i \
-	gr_vector_sink_i.i \
-	gr_vector_sink_s.i \
-	gr_vector_source_b.i \
-	gr_vector_source_c.i \
-	gr_vector_source_f.i \
-	gr_vector_source_i.i \
-	gr_vector_source_s.i \
-	gr_xor_bb.i \
-	gr_xor_ii.i \
-	gr_xor_ss.i
-
-GENERATED_CC = \
-	gr_add_cc.cc \
-	gr_add_const_cc.cc \
-	gr_add_const_ff.cc \
-	gr_add_const_ii.cc \
-	gr_add_const_sf.cc \
-	gr_add_const_ss.cc \
-	gr_add_const_vcc.cc \
-	gr_add_const_vff.cc \
-	gr_add_const_vii.cc \
-	gr_add_const_vss.cc \
-	gr_add_ii.cc \
-	gr_add_ss.cc \
-	gr_and_bb.cc \
-	gr_and_const_bb.cc \
-	gr_and_const_ii.cc \
-	gr_and_const_ss.cc \
-	gr_and_ii.cc \
-	gr_and_ss.cc \
-	gr_argmax_fs.cc \
-	gr_argmax_is.cc \
-	gr_argmax_ss.cc \
-	gr_chunks_to_symbols_bc.cc \
-	gr_chunks_to_symbols_bf.cc \
-	gr_chunks_to_symbols_ic.cc \
-	gr_chunks_to_symbols_if.cc \
-	gr_chunks_to_symbols_sc.cc \
-	gr_chunks_to_symbols_sf.cc \
-	gr_divide_cc.cc \
-	gr_divide_ff.cc \
-	gr_divide_ii.cc \
-	gr_divide_ss.cc \
-	gr_integrate_cc.cc \
-	gr_integrate_ff.cc \
-	gr_integrate_ii.cc \
-	gr_integrate_ss.cc \
-	gr_max_ff.cc \
-	gr_max_ii.cc \
-	gr_max_ss.cc \
-	gr_moving_average_cc.cc \
-	gr_moving_average_ff.cc \
-	gr_moving_average_ii.cc \
-	gr_moving_average_ss.cc \
-	gr_multiply_const_ii.cc \
-	gr_multiply_const_ss.cc \
-	gr_multiply_const_vcc.cc \
-	gr_multiply_const_vff.cc \
-	gr_multiply_const_vii.cc \
-	gr_multiply_const_vss.cc \
-	gr_multiply_ii.cc \
-	gr_multiply_ss.cc \
-	gr_mute_cc.cc \
-	gr_mute_ff.cc \
-	gr_mute_ii.cc \
-	gr_mute_ss.cc \
-	gr_noise_source_c.cc \
-	gr_noise_source_f.cc \
-	gr_noise_source_i.cc \
-	gr_noise_source_s.cc \
-	gr_not_bb.cc \
-	gr_not_ii.cc \
-	gr_not_ss.cc \
-	gr_or_bb.cc \
-	gr_or_ii.cc \
-	gr_or_ss.cc \
-	gr_packed_to_unpacked_bb.cc \
-	gr_packed_to_unpacked_ii.cc \
-	gr_packed_to_unpacked_ss.cc \
-	gr_peak_detector_fb.cc \
-	gr_peak_detector_ib.cc \
-	gr_peak_detector_sb.cc \
-	gr_probe_signal_b.cc \
-	gr_probe_signal_s.cc \
-	gr_probe_signal_i.cc \
-	gr_probe_signal_f.cc \
-	gr_probe_signal_c.cc \
-	gr_probe_signal_vb.cc \
-	gr_probe_signal_vs.cc \
-	gr_probe_signal_vi.cc \
-	gr_probe_signal_vf.cc \
-	gr_probe_signal_vc.cc \
-	gr_sample_and_hold_bb.cc \
-	gr_sample_and_hold_ff.cc \
-	gr_sample_and_hold_ii.cc \
-	gr_sample_and_hold_ss.cc \
-	gr_sig_source_c.cc \
-	gr_sig_source_f.cc \
-	gr_sig_source_i.cc \
-	gr_sig_source_s.cc \
-	gr_sub_cc.cc \
-	gr_sub_ff.cc \
-	gr_sub_ii.cc \
-	gr_sub_ss.cc \
-	gr_unpacked_to_packed_bb.cc \
-	gr_unpacked_to_packed_ii.cc \
-	gr_unpacked_to_packed_ss.cc \
-	gr_vector_sink_b.cc \
-	gr_vector_sink_c.cc \
-	gr_vector_sink_f.cc \
-	gr_vector_sink_i.cc \
-	gr_vector_sink_s.cc \
-	gr_vector_source_b.cc \
-	gr_vector_source_c.cc \
-	gr_vector_source_f.cc \
-	gr_vector_source_i.cc \
-	gr_vector_source_s.cc \
-	gr_xor_bb.cc \
-	gr_xor_ii.cc \
-	gr_xor_ss.cc
-
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
index d3c381b4b..5b740d916 100644
--- a/gnuradio-core/src/lib/swig/CMakeLists.txt
+++ b/gnuradio-core/src/lib/swig/CMakeLists.txt
@@ -43,7 +43,7 @@ set(GR_SWIG_LIBRARIES gnuradio-core)
 # X86_64, g++'s resident set size was 650MB!
 # ----------------------------------------------------------------
 
-set(GR_SWIG_TARGET_DEPS gengen_generated filter_generated)
+set(GR_SWIG_TARGET_DEPS general_generated gengen_generated filter_generated pmt_swig)
 
 foreach(what runtime general gengen filter io hier)
     SET(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${what}_swig_doc.i)
@@ -61,8 +61,11 @@ foreach(what runtime general gengen filter io hier)
         DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
         COMPONENT "core_swig"
     )
+    list(APPEND core_swig_deps ${SWIG_MODULE_gnuradio_core_${what}_REAL_NAME})
 endforeach(what)
 
+add_custom_target(core_swig DEPENDS ${core_swig_deps})
+
 ########################################################################
 # Install various files
 ########################################################################
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt
index dc51f0c90..39dbefa60 100644
--- a/gr-atsc/src/lib/CMakeLists.txt
+++ b/gr-atsc/src/lib/CMakeLists.txt
@@ -204,6 +204,8 @@ if(ENABLE_PYTHON)
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_ATSC_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-audio/swig/CMakeLists.txt b/gr-audio/swig/CMakeLists.txt
index 4997ca3f7..fab366660 100644
--- a/gr-audio/swig/CMakeLists.txt
+++ b/gr-audio/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_AUDIO_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 1d3d16908..5291e4d90 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -67,6 +67,8 @@ if(ENABLE_PYTHON)
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
index 0c129e181..df5f04148 100644
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@ -113,7 +113,7 @@ set(GR_SWIG_INCLUDE_DIRS
 
 # Setup swig docs to depend on includes and pull in from build directory
 set(GR_SWIG_LIBRARIES gnuradio-digital)
-set(GR_SWIG_TARGET_DEPS digital_generated_includes)
+set(GR_SWIG_TARGET_DEPS digital_generated_includes core_swig)
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i)
 set(GR_SWIG_DOC_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/../include
diff --git a/gr-fcd/swig/CMakeLists.txt b/gr-fcd/swig/CMakeLists.txt
index f715c4785..73676ae6a 100644
--- a/gr-fcd/swig/CMakeLists.txt
+++ b/gr-fcd/swig/CMakeLists.txt
@@ -25,6 +25,8 @@ include(GrSwig)
 
 #set(GR_SWIG_FLAGS -DGR_HAVE_FCD) #needed to parse fcd_swig.i
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_FCD_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt
index 7ea41f220..327666985 100644
--- a/gr-fft/swig/CMakeLists.txt
+++ b/gr-fft/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_FFT_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt
index a8335062c..a336bf8a4 100644
--- a/gr-noaa/swig/CMakeLists.txt
+++ b/gr-noaa/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_NOAA_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-pager/swig/CMakeLists.txt b/gr-pager/swig/CMakeLists.txt
index 9a8d9d0d8..0fa8e6ee5 100644
--- a/gr-pager/swig/CMakeLists.txt
+++ b/gr-pager/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_PAGER_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 9f092f6c6..e84035b9f 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${GR_QTGUI_INCLUDE_DIRS}
diff --git a/gr-shd/swig/CMakeLists.txt b/gr-shd/swig/CMakeLists.txt
index b61adfcad..878b80c0f 100644
--- a/gr-shd/swig/CMakeLists.txt
+++ b/gr-shd/swig/CMakeLists.txt
@@ -25,6 +25,8 @@ include(GrSwig)
 
 set(GR_SWIG_FLAGS -DGR_HAVE_SHD) #needed to parse shd_swig.i
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_SHD_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt
index 9080afa56..8f29f9605 100644
--- a/gr-trellis/src/lib/CMakeLists.txt
+++ b/gr-trellis/src/lib/CMakeLists.txt
@@ -187,7 +187,7 @@ if(ENABLE_PYTHON)
         trellis_siso_combined_f.i
         trellis_constellation_metrics_cf.i
         ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i
-	${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i
+        ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i
         DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
         COMPONENT "trellis_swig"
     )
@@ -198,6 +198,8 @@ if(ENABLE_PYTHON)
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_SOURCE_DEPS
     ${generated_trellis_includes}
     ${generated_trellis_swigs}
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
index 26470b3b9..795b46567 100644
--- a/gr-uhd/swig/CMakeLists.txt
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -25,6 +25,8 @@ include(GrSwig)
 
 set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_UHD_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
index c21c9a9c8..a5c5b8cbd 100644
--- a/gr-video-sdl/src/CMakeLists.txt
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -66,6 +66,8 @@ if(ENABLE_PYTHON)
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
index aaf09700f..da89370fe 100644
--- a/gr-vocoder/swig/CMakeLists.txt
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_VOCODER_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt
index 2c5f433eb..4c78575f8 100644
--- a/gr-wavelet/swig/CMakeLists.txt
+++ b/gr-wavelet/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS core_swig)
+
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_WAVELET_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt
index 72bd27a04..6ea616e10 100644
--- a/gruel/src/lib/pmt/CMakeLists.txt
+++ b/gruel/src/lib/pmt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -53,6 +53,8 @@ ADD_FILE_DEPENDENCIES(
     ${PMT_SERIAL_TAGS_H}
 )
 
+add_custom_target(pmt_generated DEPENDS ${PMT_SERIAL_TAGS_H})
+
 ########################################################################
 # Generate other pmt stuff
 ########################################################################
diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt
index a0f84c832..332d5866f 100644
--- a/gruel/src/swig/CMakeLists.txt
+++ b/gruel/src/swig/CMakeLists.txt
@@ -23,6 +23,7 @@
 include(GrPython)
 include(GrSwig)
 
+set(GR_SWIG_TARGET_DEPS pmt_generated)
 set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 set(GR_SWIG_LIBRARIES gruel)
 
@@ -43,3 +44,5 @@ install(
     DESTINATION ${GR_INCLUDE_DIR}/gruel/swig
     COMPONENT "gruel_swig"
 )
+
+add_custom_target(pmt_swig DEPENDS ${SWIG_MODULE_pmt_swig_REAL_NAME})