diff options
| author | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
| commit | cbf76b863bfd62ca22913b84bc705908a817b664 (patch) | |
| tree | 3a2692c067a60487b965201f1ed4a92ca26f0816 /gr-digital/lib/Makefile.am | |
| parent | 918d53d764736fe2be79e1a6e08aba7d2e75f56d (diff) | |
| parent | 6c3623b0b084ce9328557ebd3cd487c484ee1c5b (diff) | |
| download | gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.gz gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.bz2 gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.zip | |
Merge branch '8psk' of github.com:trondeau/gnuradio into 8psk
Conflicts:
gr-digital/lib/digital_costas_loop_cc.cc
gr-digital/python/qa_costas_loop_cc.py
Diffstat (limited to 'gr-digital/lib/Makefile.am')
| -rw-r--r-- | gr-digital/lib/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am index 83a06c898..6f641b745 100644 --- a/gr-digital/lib/Makefile.am +++ b/gr-digital/lib/Makefile.am @@ -24,13 +24,19 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # These headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - digital_costas_loop_cc.h +grinclude_HEADERS = \ + digital_constellation.h \ + digital_costas_loop_cc.h \ + digital_cma_equalizer_cc.h \ + digital_kurtotic_equalizer_cc.h lib_LTLIBRARIES = libgnuradio-digital.la -libgnuradio_digital_la_SOURCES = \ - digital_costas_loop_cc.cc +libgnuradio_digital_la_SOURCES = \ + digital_constellation.cc \ + digital_costas_loop_cc.cc \ + digital_cma_equalizer_cc.cc \ + digital_kurtotic_equalizer_cc.cc libgnuradio_digital_la_LIBADD = \ $(GNURADIO_CORE_LA) |