summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-08-19 15:25:41 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-08-19 15:25:41 +0200
commitb0b971ff322e22c1202ec100525e140068d0b911 (patch)
tree7445b99c17f1439028af4972a0e62beb2428aee8
parent1e39f6ea0eb29562b461e620f82580fbcd3a6747 (diff)
examples: Link rtpool-test to libpthread for using the POSIX threads
Also the other streams example can run without pthreads therefore enable it even if pthreads are not available. Fixes bug #592314.
-rw-r--r--tests/examples/Makefile.am11
-rw-r--r--tests/examples/streams/Makefile.am9
2 files changed, 9 insertions, 11 deletions
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 4aca55f980..20d7877347 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -17,20 +17,14 @@ else
ADAPTER_TEST_DIR =
endif
-# streams test needs pthreads
-if HAVE_PTHREAD_H
- STREAMS_TEST_DIR = streams
-else
- STREAMS_TEST_DIR =
-endif
-
always_dirs = \
controller \
helloworld \
manual \
metadata \
queue \
- stepping
+ stepping \
+ streams
#appreader
#cutter
@@ -51,7 +45,6 @@ always_dirs = \
SUBDIRS = \
$(always_dirs) \
$(ADAPTER_TEST_DIR) \
- $(STREAMS_TEST_DIR) \
$(GST_PARSE_DIRS) \
$(GST_LOADSAVE_DIRS)
diff --git a/tests/examples/streams/Makefile.am b/tests/examples/streams/Makefile.am
index 39f574d276..910df0ac37 100644
--- a/tests/examples/streams/Makefile.am
+++ b/tests/examples/streams/Makefile.am
@@ -1,9 +1,14 @@
-noinst_PROGRAMS = stream-status rtpool-test
+noinst_PROGRAMS = stream-status
+if HAVE_PTHREAD_H
+noinst_PROGRAMS += rtpool-test
+endif
stream_status_SOURCES = stream-status.c
stream_status_LDADD = $(GST_OBJ_LIBS)
stream_status_CFLAGS = $(GST_OBJ_CFLAGS)
rtpool_test_SOURCES = rtpool-test.c testrtpool.h testrtpool.c
-rtpool_test_LDADD = $(GST_OBJ_LIBS)
+rtpool_test_LDADD = $(GST_OBJ_LIBS) -lpthread
rtpool_test_CFLAGS = $(GST_OBJ_CFLAGS)
+
+EXTRA_DIST = rtpool-test.c testrtpool.h testrtpool.c