diff options
| author | Matt Turner <[email protected]> | 2012-09-18 21:51:25 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-10-03 13:56:24 -0700 |
| commit | 421dda800de3aff588e97ccb6398b94e780590cd (patch) | |
| tree | 188df5f26c1cf86796ed7f7d9c37f27cc8074ce0 /src | |
| parent | 89e76252ca3fd015544f76d0f528babe9c723938 (diff) | |
build: Use PTHREAD_LIBS and PTHREAD_CFLAGS
(cherry picked from commit b6651ae6ad314a93287e431a41f5c7a8f8f6c855)
Conflicts:
src/mesa/main/tests/Makefile.am
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/tests/Makefile.am | 8 | ||||
| -rw-r--r-- | src/glx/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | src/mapi/glapi/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | src/mesa/main/tests/Makefile.am | 6 |
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 74e02a8ccca..ef70c752005 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,4 +17,5 @@ main_test_SOURCES = \ main_test_LDADD = \ $(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/gtest/libgtest.la \ - -lpthread + $(PTHREAD_LIBS) \ + $(DLOPEN_LIBS) |