From 8a96491618583b0340f5d35277cfd48e2ba280f6 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 2 Jan 2002 14:07:46 +0000 Subject: [PATCH] fixes for make distcheck does GST_ELEMENT_IS_COTHREAD_STOPPING still exist ? and if so, how should it be found by the... Original commit message from CVS: fixes for make distcheck does GST_ELEMENT_IS_COTHREAD_STOPPING still exist ? and if so, how should it be found by the bytestream test ? --- gst/schedulers/Makefile.am | 2 +- tests/old/testsuite/Makefile.am | 4 ++-- tests/old/testsuite/bytestream/Makefile.am | 8 ++++---- tests/old/testsuite/bytestream/gstbstest.c | 6 ++++-- tests/old/testsuite/plugin/Makefile.am | 4 ++-- testsuite/Makefile.am | 4 ++-- testsuite/bytestream/Makefile.am | 8 ++++---- testsuite/bytestream/gstbstest.c | 6 ++++-- testsuite/plugin/Makefile.am | 4 ++-- 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am index fd889a2..98de654 100644 --- a/gst/schedulers/Makefile.am +++ b/gst/schedulers/Makefile.am @@ -6,4 +6,4 @@ libgstbasicscheduler_la_SOURCES = gstbasicscheduler.c libgstbasicscheduler_la_LDFLAGS = -version-info $(GST_LIBVERSION) -libgstbasicscheduler_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +libgstbasicscheduler_la_CFLAGS = $(GST_CFLAGS) diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am index 1cbcbb1..6e4f476 100644 --- a/tests/old/testsuite/Makefile.am +++ b/tests/old/testsuite/Makefile.am @@ -1,5 +1,5 @@ -# FIXME : refcounting threads -SUBDIRS = capsnego plugin bytestream cleanup +# FIXME : refcounting threads bytestream +SUBDIRS = capsnego plugin cleanup testprogs = test_gst_init diff --git a/tests/old/testsuite/bytestream/Makefile.am b/tests/old/testsuite/bytestream/Makefile.am index 6567966..bd66aae 100644 --- a/tests/old/testsuite/bytestream/Makefile.am +++ b/tests/old/testsuite/bytestream/Makefile.am @@ -1,14 +1,14 @@ -filterdir = $(libdir)/gst +## filterdir = $(libdir)/gst testprogs = test1 check_PROGRAMS = $(testprogs) test1_SOURCES = test1.c gstbstest.c mem.c -test1_LDFLAGS = -L$(top_builddir)/libs/bytestream/ -lgstbytestream +test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream -L$(top_builddir)/gst/schedulers/ -lgstbasicscheduler +test1_CFLAGS = $(GST_CFLAGS) noinst_HEADERS = mem.h # we have nothing but apps here, we can do this safely -LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +# LIBS = $(GST_LIBS) diff --git a/tests/old/testsuite/bytestream/gstbstest.c b/tests/old/testsuite/bytestream/gstbstest.c index 4199a90..04b84cb 100644 --- a/tests/old/testsuite/bytestream/gstbstest.c +++ b/tests/old/testsuite/bytestream/gstbstest.c @@ -24,7 +24,7 @@ #include #include -#include +#include #define GST_TYPE_BSTEST (gst_bstest_get_type()) #define GST_BSTEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BSTEST,GstBsTest)) @@ -271,7 +271,9 @@ gst_bstest_loop (GstElement * element) i++; } - } while (!GST_ELEMENT_IS_COTHREAD_STOPPING (element)); +/* } while (!GST_ELEMENT_IS_COTHREAD_STOPPING (element)); */ + + } while (0); } static void diff --git a/tests/old/testsuite/plugin/Makefile.am b/tests/old/testsuite/plugin/Makefile.am index 9b1d4c9..c2286c2 100644 --- a/tests/old/testsuite/plugin/Makefile.am +++ b/tests/old/testsuite/plugin/Makefile.am @@ -1,6 +1,6 @@ # FIXME : tests need fixing -testprogs = dynamic linked static # loading registry static2 -## filterdir = $(libdir)/gst +testprogs = static # dynamic linked loading registry static2 +# filterdir = $(libdir)/gst noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 1cbcbb1..6e4f476 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -1,5 +1,5 @@ -# FIXME : refcounting threads -SUBDIRS = capsnego plugin bytestream cleanup +# FIXME : refcounting threads bytestream +SUBDIRS = capsnego plugin cleanup testprogs = test_gst_init diff --git a/testsuite/bytestream/Makefile.am b/testsuite/bytestream/Makefile.am index 6567966..bd66aae 100644 --- a/testsuite/bytestream/Makefile.am +++ b/testsuite/bytestream/Makefile.am @@ -1,14 +1,14 @@ -filterdir = $(libdir)/gst +## filterdir = $(libdir)/gst testprogs = test1 check_PROGRAMS = $(testprogs) test1_SOURCES = test1.c gstbstest.c mem.c -test1_LDFLAGS = -L$(top_builddir)/libs/bytestream/ -lgstbytestream +test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream -L$(top_builddir)/gst/schedulers/ -lgstbasicscheduler +test1_CFLAGS = $(GST_CFLAGS) noinst_HEADERS = mem.h # we have nothing but apps here, we can do this safely -LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +# LIBS = $(GST_LIBS) diff --git a/testsuite/bytestream/gstbstest.c b/testsuite/bytestream/gstbstest.c index 4199a90..04b84cb 100644 --- a/testsuite/bytestream/gstbstest.c +++ b/testsuite/bytestream/gstbstest.c @@ -24,7 +24,7 @@ #include #include -#include +#include #define GST_TYPE_BSTEST (gst_bstest_get_type()) #define GST_BSTEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BSTEST,GstBsTest)) @@ -271,7 +271,9 @@ gst_bstest_loop (GstElement * element) i++; } - } while (!GST_ELEMENT_IS_COTHREAD_STOPPING (element)); +/* } while (!GST_ELEMENT_IS_COTHREAD_STOPPING (element)); */ + + } while (0); } static void diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am index 9b1d4c9..c2286c2 100644 --- a/testsuite/plugin/Makefile.am +++ b/testsuite/plugin/Makefile.am @@ -1,6 +1,6 @@ # FIXME : tests need fixing -testprogs = dynamic linked static # loading registry static2 -## filterdir = $(libdir)/gst +testprogs = static # dynamic linked loading registry static2 +# filterdir = $(libdir)/gst noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la -- 2.7.4