|
 |
fe17fa |
From b2ae054b3aa0d6796b6936c7a89b8cce7cefe7ba Mon Sep 17 00:00:00 2001
|
|
|
fe17fa |
From: Eric Anholt <eric@anholt.net>
|
|
|
fe17fa |
Date: Fri, 13 Jun 2014 15:54:29 -0700
|
|
|
fe17fa |
Subject: [PATCH 3/3] Avoid name conflicts between pkgconfig's EGL_LIBS and a
|
|
|
fe17fa |
temporary var.
|
|
|
fe17fa |
|
|
|
fe17fa |
I felt a little uncomfortable knowing I had two things defining
|
|
|
fe17fa |
EGL_LIBS, but it worked on my system. It failed on the travis ci
|
|
|
fe17fa |
build.
|
|
|
fe17fa |
---
|
|
|
fe17fa |
test/Makefile.am | 12 ++++++------
|
|
|
fe17fa |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
fe17fa |
|
|
|
fe17fa |
diff --git a/test/Makefile.am b/test/Makefile.am
|
|
|
fe17fa |
index f29baca..1892b17 100644
|
|
|
fe17fa |
--- a/test/Makefile.am
|
|
|
fe17fa |
+++ b/test/Makefile.am
|
|
|
fe17fa |
@@ -22,9 +22,9 @@
|
|
|
fe17fa |
EPOXY = $(builddir)/../src/libepoxy.la
|
|
|
fe17fa |
|
|
|
fe17fa |
check_LTLIBRARIES = \
|
|
|
fe17fa |
- $(EGL_LIBS) \
|
|
|
fe17fa |
- $(GLX_LIBS) \
|
|
|
fe17fa |
- $(WGL_LIBS) \
|
|
|
fe17fa |
+ $(EGL_UTIL_LIB) \
|
|
|
fe17fa |
+ $(GLX_UTIL_LIB) \
|
|
|
fe17fa |
+ $(WGL_UTIL_LIB) \
|
|
|
fe17fa |
$()
|
|
|
fe17fa |
|
|
|
fe17fa |
libegl_common_la_SOURCES = \
|
|
|
fe17fa |
@@ -78,7 +78,7 @@ EGL_TESTS = \
|
|
|
fe17fa |
egl_gles2_without_glx \
|
|
|
fe17fa |
$()
|
|
|
fe17fa |
|
|
|
fe17fa |
-EGL_LIBS = libegl_common.la
|
|
|
fe17fa |
+EGL_UTIL_LIB = libegl_common.la
|
|
|
fe17fa |
endif
|
|
|
fe17fa |
|
|
|
fe17fa |
if BUILD_GLX
|
|
|
fe17fa |
@@ -116,7 +116,7 @@ GLX_TESTS = \
|
|
|
fe17fa |
$(GLX_NON_APPLE_TESTS) \
|
|
|
fe17fa |
$()
|
|
|
fe17fa |
|
|
|
fe17fa |
-GLX_LIBS = libglx_common.la
|
|
|
fe17fa |
+GLX_UTIL_LIB = libglx_common.la
|
|
|
fe17fa |
endif
|
|
|
fe17fa |
|
|
|
fe17fa |
if BUILD_WGL
|
|
|
fe17fa |
@@ -127,7 +127,7 @@ WGL_TESTS = \
|
|
|
fe17fa |
wgl_usefontbitmaps_unicode$(EXEEXT) \
|
|
|
fe17fa |
$()
|
|
|
fe17fa |
|
|
|
fe17fa |
-WGL_LIBS = libwgl_common.la
|
|
|
fe17fa |
+WGL_UTIL_LIB = libwgl_common.la
|
|
|
fe17fa |
endif
|
|
|
fe17fa |
|
|
|
fe17fa |
egl_has_extension_nocontext_LDADD = $(EPOXY) libegl_common.la $(X11_LIBS)
|
|
|
fe17fa |
--
|
|
|
fe17fa |
1.9.3
|
|
|
fe17fa |
|