diff options
| author | jcorgan | 2007-08-23 18:46:20 +0000 |
|---|---|---|
| committer | jcorgan | 2007-08-23 18:46:20 +0000 |
| commit | f561a45ce55debd0662ea38e17b2ea4ad50ad771 (patch) | |
| tree | 6b3df729a76db837eb3cb8460fa76aff8e2d626a /gnuradio-core/src/lib/runtime/Makefile.am | |
| parent | 8c9188a05a0334e59553ded02052dc1ecb67feb6 (diff) | |
| download | gnuradio-f561a45ce55debd0662ea38e17b2ea4ad50ad771.tar.gz gnuradio-f561a45ce55debd0662ea38e17b2ea4ad50ad771.tar.bz2 gnuradio-f561a45ce55debd0662ea38e17b2ea4ad50ad771.zip | |
Merge r6160:6168 from jcorgan/fg into trunk.
Refactors gr_simple_flowgraph into gr_flowgraph and gr_flat_flowgraph.
Adds cppunit-based QA.
Trial fix for ticket:164 included for free.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6169 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/runtime/Makefile.am')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/Makefile.am | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am index b15e651dd..346f23b6a 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.am +++ b/gnuradio-core/src/lib/runtime/Makefile.am @@ -31,8 +31,8 @@ libruntime_la_LIBADD = \ libruntime_la_SOURCES = \ gr_basic_block.cc \ - gr_simple_flowgraph.cc \ - gr_simple_flowgraph_detail.cc \ + gr_flowgraph.cc \ + gr_flat_flowgraph.cc \ gr_block.cc \ gr_block_detail.cc \ gr_hier_block2.cc \ @@ -66,14 +66,15 @@ libruntime_qa_la_SOURCES = \ qa_gr_block.cc \ qa_gr_hier_block2.cc \ qa_gr_buffer.cc \ + qa_gr_flowgraph.cc \ qa_gr_io_signature.cc \ qa_gr_vmcircbuf.cc \ qa_runtime.cc grinclude_HEADERS = \ gr_basic_block.h \ - gr_simple_flowgraph.h \ - gr_simple_flowgraph_detail.h \ + gr_flowgraph.h \ + gr_flat_flowgraph.h \ gr_block.h \ gr_block_detail.h \ gr_hier_block2.h \ @@ -109,6 +110,7 @@ noinst_HEADERS = \ gr_vmcircbuf_sysv_shm.h \ gr_vmcircbuf_createfilemapping.h \ qa_gr_block.h \ + qa_gr_flowgraph.h \ qa_gr_hier_block2.h \ qa_gr_buffer.h \ qa_gr_io_signature.h \ @@ -135,3 +137,5 @@ swiginclude_HEADERS = \ gr_sync_interpolator.i \ gr_swig_block_magic.i \ runtime.i + +MOSTLYCLEANFILES = *~ *.loT |