projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e45a9ce
)
mesa/tests: Don't build glapi tests with shared-glapi
author
Ian Romanick
<ian.d.romanick@intel.com>
Tue, 31 Jul 2012 21:10:54 +0000
(14:10 -0700)
committer
Ian Romanick
<ian.d.romanick@intel.com>
Wed, 8 Aug 2012 17:06:25 +0000
(10:06 -0700)
This fixes 'make check' on with --enable-shared-glapi. This test cannot work
in that environment.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
src/mapi/glapi/tests/Makefile.am
patch
|
blob
|
history
diff --git
a/src/mapi/glapi/tests/Makefile.am
b/src/mapi/glapi/tests/Makefile.am
index 96fc8713bd3054b68c6034b87ac09bd1eff8a2ba..d1d2f03827ae4bff086161a7455d704a36ac80bc 100644
(file)
--- a/
src/mapi/glapi/tests/Makefile.am
+++ b/
src/mapi/glapi/tests/Makefile.am
@@
-1,3
+1,4
@@
+if !HAVE_SHARED_GLAPI
AM_CPPFLAGS = \
-I$(top_builddir)/src/gtest/include \
-I$(top_builddir)/src/mapi \
@@
-13,3
+14,4
@@
glapi_test_LDADD = \
$(top_builddir)/src/mapi/glapi/libglapi.la \
$(top_builddir)/src/gtest/libgtest.la \
-lpthread
+endif