diff options
| author | Mark Nauwelaerts <manauw@skynet.be> | 2008-03-05 06:03:03 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-03-05 06:03:03 +0000 |
| commit | acb81c58c547b0e6155fd61b7914f39deea428ad (patch) | |
| tree | 8427c825ea71f1fee1dbc46b37e4b9d35d6a14c8 /ext/mplex/Makefile.am | |
| parent | 646ac4cdf2054e5cd38c1869701a4e839f8436b2 (diff) | |
| download | gstreamer-plugins-bad-acb81c58c547b0e6155fd61b7914f39deea428ad.tar.gz | |
Port mplex element to 0.10. Fixes bug #520329.
Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw at skynet dot be>
* configure.ac:
* ext/Makefile.am:
* ext/mplex/Makefile.am:
* ext/mplex/gstmplex.cc:
* ext/mplex/gstmplex.hh:
* ext/mplex/gstmplexibitstream.cc:
* ext/mplex/gstmplexibitstream.hh:
* ext/mplex/gstmplexjob.cc:
* ext/mplex/gstmplexjob.hh:
* ext/mplex/gstmplexoutputstream.cc:
* ext/mplex/gstmplexoutputstream.hh:
Port mplex element to 0.10. Fixes bug #520329.
* tests/check/Makefile.am:
* tests/check/elements/mplex.c: (test_sink_event), (setup_src_pad),
(teardown_src_pad), (setup_mplex), (cleanup_mplex),
(GST_START_TEST), (mplex_suite), (main):
Add unit test for the mplex element.
Diffstat (limited to 'ext/mplex/Makefile.am')
| -rw-r--r-- | ext/mplex/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am index d99b5b7c2..aa51a9950 100644 --- a/ext/mplex/Makefile.am +++ b/ext/mplex/Makefile.am @@ -6,8 +6,10 @@ libgstmplex_la_SOURCES = \ gstmplexjob.cc \ gstmplexoutputstream.cc -libgstmplex_la_CXXFLAGS = $(GST_CFLAGS) $(MPLEX_CFLAGS) -libgstmplex_la_LIBADD = $(MPLEX_LIBS) +libgstmplex_la_CXXFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS) +libgstmplex_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(MPLEX_LIBS) libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ |