From ca760181b4420696c7e86aa2951d7203522ad1e8 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Fri, 16 Mar 2012 12:55:40 -0400 Subject: shared-glapi: Convert to automake This fixes a build problem where EGL links to libgbm.la, which encodes a relative path to it's libglapi.so dependency. The relative path breaks when the linker tries to resolve it from src/egl/main instead of src/gbm. Typically we silently fall back to the system libglapi.so, which is wrong and breaks when there isn't one. Morale of the story: don't mix mklib and libtool. --- src/glx/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glx/Makefile.am') diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 79dc405372e..a11bd3ff011 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -21,7 +21,7 @@ if HAVE_SHARED_GLAPI SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI -SHARED_GLAPI_LIBS = -L$(top_builddir)/$(LIB_DIR) -lglapi +SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif GLAPI_LIB = ../mapi/glapi/libglapi.a -- cgit v1.2.3