diff options
author | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
---|---|---|
committer | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
commit | 559d397de9ba937f470d27a7ad8b8d15f8f2f90f (patch) | |
tree | 221f32c0c10e55f9072fb22623e01fcd1dd63353 /gr-uhd/lib/Makefile.am | |
parent | a6b5781e36ff75adb1e4d39d755d4ab8f5efd9dd (diff) | |
parent | 53eee1c624794056fcba50a5eb50b864cbf159dd (diff) | |
download | gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.gz gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.bz2 gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.zip |
Merge branch 'next' into tagging
Diffstat (limited to 'gr-uhd/lib/Makefile.am')
-rw-r--r-- | gr-uhd/lib/Makefile.am | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index 1260201a5..b4b1abfc6 100644 --- a/gr-uhd/lib/Makefile.am +++ b/gr-uhd/lib/Makefile.am @@ -29,13 +29,17 @@ AM_CPPFLAGS = \ lib_LTLIBRARIES = libgnuradio-uhd.la libgnuradio_uhd_la_SOURCES = \ - utils.cc \ + uhd_multi_usrp_source.cc \ + uhd_multi_usrp_sink.cc \ + uhd_single_usrp_source.cc \ + uhd_single_usrp_sink.cc + +# add the deprecated sources +libgnuradio_uhd_la_SOURCES += \ uhd_mimo_source.cc \ uhd_mimo_sink.cc \ uhd_simple_source.cc \ - uhd_simple_sink.cc \ - uhd_single_usrp_source.cc \ - uhd_single_usrp_sink.cc + uhd_simple_sink.cc libgnuradio_uhd_la_LIBADD = \ $(GNURADIO_CORE_LA) \ @@ -44,12 +48,9 @@ libgnuradio_uhd_la_LIBADD = \ libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS) grinclude_HEADERS = \ - uhd_mimo_source.h \ - uhd_mimo_sink.h \ - uhd_simple_source.h \ - uhd_simple_sink.h \ + uhd_multi_usrp_source.h \ + uhd_multi_usrp_sink.h \ uhd_single_usrp_source.h \ uhd_single_usrp_sink.h -noinst_HEADERS = \ - utils.h +noinst_HEADERS = |