tests: Use -pthread in CFLAGS instead of -lpthread

-lpthread is not always a valid flag to pull pthread support, especially
on Android it will fail to link due to a missing libpthread.so. The more
generic way to build-in pthread support is to use the -pthread CFLAG, so
let's use it instead.

Signed-off-by: Tomasz Figa <tfiga@chromium.org>
[Emil Velikov: rebase on top of previous commit]
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am
index 357d6b8..b636172 100644 (file)
--- a/tests/exynos/Makefile.am
+++ b/tests/exynos/Makefile.am
@@ -1,4 +1,5 @@
 AM_CFLAGS = \
+       -pthread \
        $(WARN_CFLAGS)\
        -I $(top_srcdir)/include/drm \
        -I $(top_srcdir)/libkms/ \
@@ -34,8 +35,7 @@ exynos_fimg2d_perf_LDADD = \
 
 exynos_fimg2d_event_LDADD = \
        $(top_builddir)/libdrm.la \
-       $(top_builddir)/exynos/libdrm_exynos.la \
-       -lpthread
+       $(top_builddir)/exynos/libdrm_exynos.la
 
 exynos_fimg2d_test_LDADD = \
        $(top_builddir)/libdrm.la \

diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index 9686ccb..4b296c8 100644 (file)
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -3,6 +3,7 @@ include Makefile.sources
 AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS))
 
 AM_CFLAGS += \
+       -pthread \
        -I$(top_srcdir)/include/drm \
        -I$(top_srcdir)/tests \
        -I$(top_srcdir)
@@ -20,5 +21,4 @@ modetest_SOURCES = $(MODETEST_FILES)
 modetest_LDADD = \
        $(top_builddir)/libdrm.la \
        $(top_builddir)/tests/util/libutil.la \
-       $(CAIRO_LIBS) \
-       -lpthread
+       $(CAIRO_LIBS)

diff --git a/tests/nouveau/Makefile.am b/tests/nouveau/Makefile.am
index 225d6e6..3c799a8 100644 (file)
--- a/tests/nouveau/Makefile.am
+++ b/tests/nouveau/Makefile.am
@@ -1,4 +1,5 @@
 AM_CFLAGS = \
+       -pthread \
        $(WARN_CFLAGS) \
        -I$(top_srcdir)/include/drm \
        -I$(top_srcdir)/nouveau \
@@ -7,7 +8,7 @@ AM_CFLAGS = \
 LDADD = \
        ../../nouveau/libdrm_nouveau.la \
        ../../libdrm.la \
-       -ldl -lpthread
+       -ldl
 
 TESTS = threaded