diff options
| author | Tom Rondeau | 2011-04-08 15:37:53 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-08 15:37:53 -0400 |
| commit | 73a22b09349a1645d74701941e82215f390d71bb (patch) | |
| tree | 96df6fcce3ee4472ee1cf0021611100878adb196 /gr-trellis/src/lib/Makefile.am | |
| parent | 20678e6dc1c2812a6b9abc3a8bf47f368a602f0d (diff) | |
| parent | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (diff) | |
| download | gnuradio-73a22b09349a1645d74701941e82215f390d71bb.tar.gz gnuradio-73a22b09349a1645d74701941e82215f390d71bb.tar.bz2 gnuradio-73a22b09349a1645d74701941e82215f390d71bb.zip | |
Merge branch 'constell_obj' into 8psk
Diffstat (limited to 'gr-trellis/src/lib/Makefile.am')
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 08e75291a..d6926f2a0 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -66,12 +66,12 @@ grinclude_HEADERS = \ quicksort_index.h \ base.h \ interleaver.h \ - trellis_metric_type.h \ trellis_calc_metric.h \ trellis_permutation.h \ trellis_siso_type.h \ trellis_siso_f.h \ trellis_siso_combined_f.h \ + trellis_constellation_metrics_cf.h \ $(GENERATED_H) lib_LTLIBRARIES = libgnuradio-trellis.la @@ -85,6 +85,7 @@ libgnuradio_trellis_la_SOURCES = \ trellis_permutation.cc \ trellis_siso_f.cc \ trellis_siso_combined_f.cc \ + trellis_constellation_metrics_cf.cc \ $(GENERATED_CC) libgnuradio_trellis_la_LIBADD = \ @@ -119,6 +120,7 @@ trellis_swiginclude_headers = \ trellis_permutation.i \ trellis_siso_f.i \ trellis_siso_combined_f.i \ + trellis_constellation_metrics_cf.i \ trellis_generated.i # Do creation and inclusion of other Makefiles last |