5 files changed, 19 insertions, 13 deletions
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index d6926f2a0..d48486448 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -29,8 +29,9 @@ EXTRA_DIST += \
 	trellis.test
 
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \
+	-I$(abs_top_builddir)/gr-digital/lib
+ 
 # ----------------------------------------------------------------
 # these scripts generate trellis codes from template files
 
@@ -142,6 +143,11 @@ include $(top_srcdir)/Makefile.par.gen
 
 BUILT_SOURCES += $(python_built_sources)
 
+# Location of non-standard SWIG interface files
+trellis_swig_args =    \
+	-I$(abs_top_builddir)/gr-digital/lib \
+	-I$(abs_top_builddir)/gr-digital/swig
+
 if GUILE
 TESTS += run_guile_tests
 endif
diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index fe74c8d9f..7e379a918 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -29,7 +29,7 @@
 #include "trellis_siso_f.h"
 #include "trellis_siso_combined_f.h"
 #include "trellis_constellation_metrics_cf.h"
-#include "gr_constellation.h"
+#include "digital_constellation.h"
 %}
 
 
@@ -48,7 +48,7 @@
 %include "trellis_generated.i"
 
 %import "gr_metric_type.h"
-%import "gr_constellation.i"
+%import "digital_constellation.i"
 
 %pythoncode %{
   from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc b/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc
index fb529aaa7..1d03886f1 100644
--- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc
@@ -35,14 +35,14 @@
 
 
 trellis_constellation_metrics_cf_sptr
-trellis_make_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE)
+trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE)
 {
   return gnuradio::get_initial_sptr (new trellis_constellation_metrics_cf (constellation, TYPE));
 }
 
 
 
-trellis_constellation_metrics_cf::trellis_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE)
+trellis_constellation_metrics_cf::trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE)
   : gr_block ("constellation_metrics_cf",
 	      gr_make_io_signature (1, -1, sizeof (gr_complex)),
 	      gr_make_io_signature (1, -1, sizeof (float))),
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
index df35f16d2..1a0eb72ee 100644
--- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
@@ -24,13 +24,13 @@
 #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
 
 #include <gr_block.h>
-#include <gr_constellation.h>
+#include <digital_constellation.h>
 #include <gr_metric_type.h>
 
 class trellis_constellation_metrics_cf;
 typedef boost::shared_ptr<trellis_constellation_metrics_cf> trellis_constellation_metrics_cf_sptr;
 
-trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE);
+trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
 
 /*!
  * \brief Evaluate metrics for use by the Viterbi algorithm.
@@ -46,14 +46,14 @@ class trellis_constellation_metrics_cf : public gr_block
 		    gr_vector_const_void_star &input_items,
 		    gr_vector_void_star &output_items);
  protected:
-  trellis_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE);
+  trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
  
  private:
-  gr_constellation_sptr d_constellation;
+  digital_constellation_sptr d_constellation;
   trellis_metric_type_t d_TYPE;
   unsigned int d_O;
   unsigned int d_D;
-  friend trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE);
+  friend trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
 
 };
 
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.i b/gr-trellis/src/lib/trellis_constellation_metrics_cf.i
index f863453f2..c17522b11 100644
--- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.i
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.i
@@ -24,10 +24,10 @@
 
 GR_SWIG_BLOCK_MAGIC(trellis,constellation_metrics_cf);
 
-trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE);
+trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
 
 class trellis_constellation_metrics_cf : public gr_block
 {
 private:
-  trellis_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE);
+  trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
 };