3 files changed, 7 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt
index a188dae0e3..e3da278f2f 100644
--- a/gnuradio-core/src/lib/gengen/CMakeLists.txt
+++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt
@@ -113,7 +113,6 @@ expand_h_cc_i(gr_peak_detector_XX             fb ib sb)
 add_custom_target(gengen_generated DEPENDS
     ${generated_gengen_includes}
     ${generated_gengen_swigs}
-    ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i
 )
 
 ########################################################################
@@ -148,6 +147,10 @@ add_custom_command(
         ${generated_gengen_swigs}
 )
 
+add_custom_target(gengen_generated_index DEPENDS
+    ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i
+)
+
 ########################################################################
 # Handle the generated sources + a few non-generated ones
 ########################################################################
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
index ef07729440..73a6f92ff1 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 gengen_generated gengen_generated_index filter_generated)
 
 GR_SWIG_MAKE(gnuradio_core_runtime gnuradio_core_runtime.i)
 GR_SWIG_MAKE(gnuradio_core_general gnuradio_core_general.i)
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt
index 3f43dfc626..6730326380 100644
--- a/gr-trellis/src/lib/CMakeLists.txt
+++ b/gr-trellis/src/lib/CMakeLists.txt
@@ -103,7 +103,6 @@ expand_h_cc_i(trellis_pccc_decoder_combined_XX   fb fs fi cb cs ci)
 add_custom_target(trellis_generated DEPENDS
     ${generated_trellis_includes}
     ${generated_trellis_swigs}
-    ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i
 )
 
 ########################################################################
@@ -212,7 +211,8 @@ if(ENABLE_PYTHON)
 include(GrPython)
 include(GrSwig)
 
-set(GR_SWIG_TARGET_DEPS trellis_generated)
+set(GR_SWIG_SOURCE_DEPS ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i)
+set(GR_SWIG_TARGET_DEPS trellis_generated trellis_generated_index)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_TRELLIS_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}