summaryrefslogtreecommitdiff
path: root/src/egl/main
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-03-16 12:55:40 -0400
committerKristian Høgsberg <krh@bitplanet.net>2012-03-19 11:13:06 -0400
commitca760181b4420696c7e86aa2951d7203522ad1e8 (patch)
tree88e11d719bbd0963594645ab4d16c9c051b8eace /src/egl/main
parent91ddfa72b4384d04e4d84e60b4cdf3efee7ef49b (diff)
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.
Diffstat (limited to 'src/egl/main')
-rw-r--r--src/egl/main/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index a8072c18213..9c3935b7857 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -93,7 +93,6 @@ endif
if HAVE_EGL_PLATFORM_DRM
AM_CFLAGS += -DHAVE_DRM_PLATFORM
libEGL_la_LIBADD += ../../gbm/libgbm.la
-libEGL_la_LIBADD += ../../gbm/libgbm.la
endif
if HAVE_EGL_PLATFORM_FBDEV