summaryrefslogtreecommitdiff
path: root/dist/libepoxy/test/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'dist/libepoxy/test/Makefile.am')
-rw-r--r--dist/libepoxy/test/Makefile.am18
1 files changed, 10 insertions, 8 deletions
diff --git a/dist/libepoxy/test/Makefile.am b/dist/libepoxy/test/Makefile.am
index b1dcc1803..1892b17f3 100644
--- a/dist/libepoxy/test/Makefile.am
+++ b/dist/libepoxy/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 = \
@@ -46,7 +46,9 @@ libwgl_common_la_LIBADD = $(EPOXY)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- $(X11_CFLAGS)
+ $(X11_CFLAGS) \
+ $(EGL_CFLAGS) \
+ $()
AM_CFLAGS = $(CWARNFLAGS)
@@ -76,7 +78,7 @@ EGL_TESTS = \
egl_gles2_without_glx \
$()
-EGL_LIBS = libegl_common.la
+EGL_UTIL_LIB = libegl_common.la
endif
if BUILD_GLX
@@ -114,7 +116,7 @@ GLX_TESTS = \
$(GLX_NON_APPLE_TESTS) \
$()
-GLX_LIBS = libglx_common.la
+GLX_UTIL_LIB = libglx_common.la
endif
if BUILD_WGL
@@ -125,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)
@@ -179,7 +181,7 @@ glx_static_LDFLAGS = -static
glx_shared_znow_SOURCES = glx_static.c
glx_shared_znow_LDADD = $(DLOPEN_LIBS) $(EPOXY) libglx_common.la $(X11_LIBS)
-glx_shared_znow_LDFLAGS = -z now
+glx_shared_znow_LDFLAGS = -Wl,-z,now
khronos_typedefs_SOURCES = \
khronos_typedefs.c \