Avoid name conflicts between pkgconfig's EGL_LIBS and a temporary var.

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.
macos/v1.5.9
Eric Anholt 11 years ago
parent 0096b79923
commit b2ae054b3a
  1. 12
      test/Makefile.am

@ -22,9 +22,9 @@
EPOXY = $(builddir)/../src/libepoxy.la EPOXY = $(builddir)/../src/libepoxy.la
check_LTLIBRARIES = \ check_LTLIBRARIES = \
$(EGL_LIBS) \ $(EGL_UTIL_LIB) \
$(GLX_LIBS) \ $(GLX_UTIL_LIB) \
$(WGL_LIBS) \ $(WGL_UTIL_LIB) \
$() $()
libegl_common_la_SOURCES = \ libegl_common_la_SOURCES = \
@ -78,7 +78,7 @@ EGL_TESTS = \
egl_gles2_without_glx \ egl_gles2_without_glx \
$() $()
EGL_LIBS = libegl_common.la EGL_UTIL_LIB = libegl_common.la
endif endif
if BUILD_GLX if BUILD_GLX
@ -116,7 +116,7 @@ GLX_TESTS = \
$(GLX_NON_APPLE_TESTS) \ $(GLX_NON_APPLE_TESTS) \
$() $()
GLX_LIBS = libglx_common.la GLX_UTIL_LIB = libglx_common.la
endif endif
if BUILD_WGL if BUILD_WGL
@ -127,7 +127,7 @@ WGL_TESTS = \
wgl_usefontbitmaps_unicode$(EXEEXT) \ wgl_usefontbitmaps_unicode$(EXEEXT) \
$() $()
WGL_LIBS = libwgl_common.la WGL_UTIL_LIB = libwgl_common.la
endif endif
egl_has_extension_nocontext_LDADD = $(EPOXY) libegl_common.la $(X11_LIBS) egl_has_extension_nocontext_LDADD = $(EPOXY) libegl_common.la $(X11_LIBS)

Loading…
Cancel
Save