diff options
| author | Eric Anholt <eric@anholt.net> | 2014-06-13 15:54:29 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-06-13 15:57:11 -0700 |
| commit | b2ae054b3aa0d6796b6936c7a89b8cce7cefe7ba (patch) | |
| tree | d4f5655dd526f0c63e32641fc58f411a474d7744 | |
| parent | 0096b79923f4a2b73b004f679d48ef110936a459 (diff) | |
| download | libepoxy-temp.tar.gz | |
Avoid name conflicts between pkgconfig's EGL_LIBS and a temporary var.temp
I felt a little uncomfortable knowing I had two things defining
EGL_LIBS, but it worked on my system. It failed on the travis ci
build.
| -rw-r--r-- | test/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index f29baca..1892b17 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -22,9 +22,9 @@ EPOXY = $(builddir)/../src/libepoxy.la check_LTLIBRARIES = \ - $(EGL_LIBS) \ - $(GLX_LIBS) \ - $(WGL_LIBS) \ + $(EGL_UTIL_LIB) \ + $(GLX_UTIL_LIB) \ + $(WGL_UTIL_LIB) \ $() libegl_common_la_SOURCES = \ @@ -78,7 +78,7 @@ EGL_TESTS = \ egl_gles2_without_glx \ $() -EGL_LIBS = libegl_common.la +EGL_UTIL_LIB = libegl_common.la endif if BUILD_GLX @@ -116,7 +116,7 @@ GLX_TESTS = \ $(GLX_NON_APPLE_TESTS) \ $() -GLX_LIBS = libglx_common.la +GLX_UTIL_LIB = libglx_common.la endif if BUILD_WGL @@ -127,7 +127,7 @@ WGL_TESTS = \ wgl_usefontbitmaps_unicode$(EXEEXT) \ $() -WGL_LIBS = libwgl_common.la +WGL_UTIL_LIB = libwgl_common.la endif egl_has_extension_nocontext_LDADD = $(EPOXY) libegl_common.la $(X11_LIBS) |