diff options
| author | Tom Rondeau | 2010-11-29 13:01:07 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-29 13:01:07 -0500 |
| commit | 970d0eff587c0dfa04543473f9525b45e0f7bb2d (patch) | |
| tree | 6c9089678147053501611a3eadaf31ef4d803f87 /gnuradio-core/src/lib/runtime/Makefile.am | |
| parent | b245c628f4f5e252740e0248a33c0266640cb0bb (diff) | |
| parent | 34a9654fa10efcf360fde9c42c624739abaabbc5 (diff) | |
| download | gnuradio-970d0eff587c0dfa04543473f9525b45e0f7bb2d.tar.gz gnuradio-970d0eff587c0dfa04543473f9525b45e0f7bb2d.tar.bz2 gnuradio-970d0eff587c0dfa04543473f9525b45e0f7bb2d.zip | |
Merge branch 'tagging' into next
Diffstat (limited to 'gnuradio-core/src/lib/runtime/Makefile.am')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am index f67e8843d..dd9a8ea64 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.am +++ b/gnuradio-core/src/lib/runtime/Makefile.am @@ -68,7 +68,8 @@ libruntime_la_SOURCES = \ gr_vmcircbuf_mmap_tmpfile.cc \ gr_vmcircbuf_createfilemapping.cc \ gr_vmcircbuf_sysv_shm.cc \ - gr_select_handler.cc + gr_select_handler.cc \ + gr_tag_info.cc libruntime_qa_la_SOURCES = \ qa_gr_block.cc \ @@ -79,6 +80,7 @@ libruntime_qa_la_SOURCES = \ qa_gr_top_block.cc \ qa_gr_io_signature.cc \ qa_gr_vmcircbuf.cc \ + qa_block_tags.cc \ qa_runtime.cc grinclude_HEADERS = \ @@ -121,7 +123,8 @@ grinclude_HEADERS = \ gr_tmp_path.h \ gr_types.h \ gr_unittests.h \ - gr_vmcircbuf.h + gr_vmcircbuf.h \ + gr_tag_info.h noinst_HEADERS = \ gr_vmcircbuf_mmap_shm_open.h \ @@ -136,6 +139,7 @@ noinst_HEADERS = \ qa_gr_io_signature.h \ qa_gr_top_block.h \ qa_gr_vmcircbuf.h \ + qa_block_tags.h \ qa_runtime.h if PYTHON |