summaryrefslogtreecommitdiff
path: root/src/gbm/Makefile.am
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/gbm/Makefile.am
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/gbm/Makefile.am')
-rw-r--r--src/gbm/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 1dbc9d15c77..dede5bc1069 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -31,8 +31,8 @@ libgbm_dri_la_CFLAGS = \
-DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_SEARCH_DIR)"' \
$(LIBDRM_CFLAGS)
-libgbm_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR)
-libgbm_la_LIBADD += libgbm_dri.la -lglapi
+libgbm_la_LIBADD += \
+ libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la
endif
all-local: libgbm.la