6 files changed, 39 insertions, 4 deletions
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
index 25a2b6f7f..5d7fdecbf 100644
--- a/gr-digital/lib/Makefile.am
+++ b/gr-digital/lib/Makefile.am
@@ -29,7 +29,8 @@ grinclude_HEADERS = 			\
 	digital_costas_loop_cc.h	\
 	digital_cma_equalizer_cc.h	\
 	digital_lms_dd_equalizer_cc.h	\
-	digital_kurtotic_equalizer_cc.h
+	digital_kurtotic_equalizer_cc.h \
+	digital_metric_type.h
 
 lib_LTLIBRARIES = libgnuradio-digital.la
 
diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc
index edf0bda22..2263bba0b 100644
--- a/gr-digital/lib/digital_constellation.cc
+++ b/gr-digital/lib/digital_constellation.cc
@@ -22,7 +22,7 @@
 
 #include <gr_io_signature.h>
 #include <digital_constellation.h>
-#include <gr_metric_type.h>
+#include <digital_metric_type.h>
 #include <gr_math.h>
 #include <gr_complex.h>
 #include <math.h>
diff --git a/gr-digital/lib/digital_constellation.h b/gr-digital/lib/digital_constellation.h
index 9da87a4de..4119b5803 100644
--- a/gr-digital/lib/digital_constellation.h
+++ b/gr-digital/lib/digital_constellation.h
@@ -27,7 +27,7 @@
 #include <math.h>
 #include <gr_complex.h>
 #include <boost/enable_shared_from_this.hpp>
-#include <gr_metric_type.h>
+#include <digital_metric_type.h>
 
 /************************************************************/
 /* digital_constellation                                    */
diff --git a/gr-digital/lib/digital_metric_type.h b/gr-digital/lib/digital_metric_type.h
new file mode 100644
index 000000000..83de166f0
--- /dev/null
+++ b/gr-digital/lib/digital_metric_type.h
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_DIGITAL_METRIC_TYPE_H
+#define INCLUDED_DIGITAL_METRIC_TYPE_H
+
+typedef enum {
+  TRELLIS_EUCLIDEAN = 200, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
+} trellis_metric_type_t;
+
+#endif
+
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
index 1e5c1de6d..69adf2568 100644
--- a/gr-digital/swig/Makefile.am
+++ b/gr-digital/swig/Makefile.am
@@ -63,6 +63,9 @@ digital_swig_swiginclude_headers =	\
 	digital_lms_dd_equalizer_cc.i	\
 	digital_kurtotic_equalizer_cc.i
 
+digital_swig_swig_args = \
+	-I$(abs_top_builddir)/gr-digital/lib
+
 if GUILE
 TESTS += run_guile_tests
 endif
 \ No newline at end of file
diff --git a/gr-digital/swig/digital_constellation.i b/gr-digital/swig/digital_constellation.i
index 7296ca114..40dd28a2b 100644
--- a/gr-digital/swig/digital_constellation.i
+++ b/gr-digital/swig/digital_constellation.i
@@ -24,7 +24,7 @@
 %template(unsigned_int_vector) std::vector<unsigned int>;
 
 // Make sure metric types get SWIGed.
-%include gr_metric_type.h
+%include digital_metric_type.h
 
 class digital_constellation;
 typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr;