diff options
| author | eb | 2007-02-26 00:40:37 +0000 |
|---|---|---|
| committer | eb | 2007-02-26 00:40:37 +0000 |
| commit | 7c9883d7500fcea8232e2dc860ceb2baaeb18823 (patch) | |
| tree | 1e2ce3f5763f75e8a8aa4b3a13e7a88ec553d5c7 /mblock/src/lib/Makefile.am | |
| parent | 455450fe17ceb0f4ed9d3c072fc7afba258b6fea (diff) | |
| download | gnuradio-7c9883d7500fcea8232e2dc860ceb2baaeb18823.tar.gz gnuradio-7c9883d7500fcea8232e2dc860ceb2baaeb18823.tar.bz2 gnuradio-7c9883d7500fcea8232e2dc860ceb2baaeb18823.zip | |
Merged mblock work-in-progress from eb/mb -r4341:4633 into trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4634 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'mblock/src/lib/Makefile.am')
| -rw-r--r-- | mblock/src/lib/Makefile.am | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am index c049bd347..e1922fcd8 100644 --- a/mblock/src/lib/Makefile.am +++ b/mblock/src/lib/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(PMT_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) +INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) TESTS = test_mblock @@ -33,6 +33,7 @@ EXTRA_DIST = # These are the source files that go into the mblock shared library libmblock_la_SOURCES = \ mb_connection.cc \ + mb_endpoint.cc \ mb_exception.cc \ mb_mblock.cc \ mb_mblock_impl.cc \ @@ -44,7 +45,7 @@ libmblock_la_SOURCES = \ mb_port_simple.cc \ mb_protocol_class.cc \ mb_runtime.cc \ - mb_runtime_impl.cc \ + mb_runtime_single_threaded.cc \ mb_util.cc @@ -53,6 +54,7 @@ libmblock_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version # link the library against the c++ standard library libmblock_la_LIBADD = \ + $(OMNITHREAD_LIBS) \ $(PMT_LIBS) \ -lstdc++ @@ -67,6 +69,7 @@ include_HEADERS = \ mb_port_simple.h \ mb_protocol_class.h \ mb_runtime.h \ + mb_runtime_single_threaded.h \ mb_util.h @@ -75,17 +78,17 @@ noinst_HEADERS = \ mb_endpoint.h \ mb_mblock_impl.h \ mb_msg_accepter_smp.h \ - mb_port_detail.h \ - mb_runtime_impl.h \ qa_mblock.h \ - qa_mblock_prims.h + qa_mblock_prims.h \ + qa_mblock_send.h # Build the qa code into its own library libmblock_qa_la_SOURCES = \ qa_mblock.cc \ - qa_mblock_prims.cc + qa_mblock_prims.cc \ + qa_mblock_send.cc # magic flags |