5 files changed, 16 insertions, 7 deletions
diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
index 33e634d953d..ee3cef63507 100644
--- a/src/glsl/tests/Makefile.am
+++ b/src/glsl/tests/Makefile.am
@@ -24,12 +24,14 @@ uniform_initializer_test_SOURCES =		\
 	copy_constant_to_storage_tests.cpp	\
 	set_uniform_initializer_tests.cpp	\
 	uniform_initializer_utils.cpp
-
+uniform_initializer_test_CFLAGS = 		\
+	$(PTHREAD_CFLAGS)
 uniform_initializer_test_LDADD =		\
 	$(top_builddir)/src/gtest/libgtest.la	\
 	$(top_builddir)/src/glsl/libglsl.la	\
 	$(top_builddir)/src/mesa/libmesa.la	\
-	-lpthread
+	$(PTHREAD_LIBS)
 
 ralloc_test_SOURCES = ralloc_test.cpp $(top_builddir)/src/glsl/ralloc.c
-ralloc_test_LDADD = $(top_builddir)/src/gtest/libgtest.la -lpthread
+ralloc_test_CFLAGS = $(PTHREAD_CFLAGS)
+ralloc_test_LDADD = $(top_builddir)/src/gtest/libgtest.la $(PTHREAD_LIBS)
diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am
index a7a23faf32e..83626fd41c6 100644
--- a/src/glx/tests/Makefile.am
+++ b/src/glx/tests/Makefile.am
@@ -1,4 +1,5 @@
 if HAVE_SHARED_GLAPI
+AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(top_builddir)/src/gtest/include \
 	-I$(top_builddir)/src/mapi \
@@ -21,5 +22,5 @@ glx_test_LDADD = \
 	$(top_builddir)/src/glx/libglx.la \
 	$(top_builddir)/src/gtest/libgtest.la \
 	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
-	-lpthread
+	$(PTHREAD_LIBS)
 endif
diff --git a/src/mapi/glapi/tests/Makefile.am b/src/mapi/glapi/tests/Makefile.am
index d1d2f03827a..a23eef2ccd7 100644
--- a/src/mapi/glapi/tests/Makefile.am
+++ b/src/mapi/glapi/tests/Makefile.am
@@ -1,4 +1,5 @@
 if !HAVE_SHARED_GLAPI
+AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(top_builddir)/src/gtest/include \
 	-I$(top_builddir)/src/mapi \
@@ -13,5 +14,5 @@ glapi_test_SOURCES =			\
 glapi_test_LDADD = \
 	$(top_builddir)/src/mapi/glapi/libglapi.la \
 	$(top_builddir)/src/gtest/libgtest.la \
-	-lpthread
+	$(PTHREAD_LIBS)
 endif
diff --git a/src/mapi/shared-glapi/tests/Makefile.am b/src/mapi/shared-glapi/tests/Makefile.am
index 49b86afb95a..23d0208e866 100644
--- a/src/mapi/shared-glapi/tests/Makefile.am
+++ b/src/mapi/shared-glapi/tests/Makefile.am
@@ -1,4 +1,5 @@
 if HAVE_SHARED_GLAPI
+AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(top_builddir)/src/gtest/include \
 	-I$(top_builddir)/src/mapi \
@@ -13,5 +14,5 @@ shared_glapi_test_SOURCES =			\
 shared_glapi_test_LDADD = \
 	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
 	$(top_builddir)/src/gtest/libgtest.la \
-	-lpthread
+	$(PTHREAD_LIBS)
 endif
diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
index cac04bcd6ec..f818e44511c 100644
--- a/src/mesa/main/tests/Makefile.am
+++ b/src/mesa/main/tests/Makefile.am
@@ -1,3 +1,6 @@
+AM_CFLAGS = \
+	$(X11_CFLAGS) \
+	$(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(top_builddir)/src/gtest/include \
 	-I$(top_builddir)/src/mapi \
@@ -14,7 +17,8 @@ main_test_SOURCES =			\
 main_test_LDADD = \
 	$(top_builddir)/src/mesa/libmesa.la \
 	$(top_builddir)/src/gtest/libgtest.la \
-	-lpthread -ldl
+	$(PTHREAD_LIBS) \
+	$(DLOPEN_LIBS)
 
 if HAVE_SHARED_GLAPI
 AM_CPPFLAGS += -DHAVE_SHARED_GLAPI