diff options
| author | Armin K <krejzi@email.com> | 2013-08-13 15:38:56 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-08-13 18:11:22 -0700 |
| commit | 7d6dcb61cdaba3a158b2b9635bf029a17cc8543d (patch) | |
| tree | 6e79e81a3f17ea2057eac81744eb92b2df9990c7 | |
| parent | 8025bac852dd059e164077522d3159d636ac2a9a (diff) | |
gbm: Link to libwayland-drm if Wayland EGL platform is enabled
We were relying on libEGL to pull in libwayland-client symbols, but with
commit 2c2e64edaba0f6aeb181ca5b51eb8dea8e9b39f9 cleaned up the
symbol leak.
CC: "9.2" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67962
Tested-by: Bryce Harrington <b.harrington@samsung.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit f423eba46e080b975a2b8366b490d99dee4729ad)
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/egl/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gbm/Makefile.am | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b3dc44d6fd6..76280a0c02e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,10 @@ if HAVE_DRI_GLX SUBDIRS += glx endif +if HAVE_EGL_PLATFORM_WAYLAND +SUBDIRS += egl/wayland +endif + if HAVE_GBM SUBDIRS += gbm endif diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index e6380ecdedf..cff943f7545 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -21,8 +21,4 @@ SUBDIRS= -if HAVE_EGL_PLATFORM_WAYLAND -SUBDIRS += wayland -endif - SUBDIRS += drivers main diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am index e22c55cfdac..1282b147c27 100644 --- a/src/gbm/Makefile.am +++ b/src/gbm/Makefile.am @@ -24,6 +24,7 @@ libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS) if HAVE_EGL_PLATFORM_WAYLAND AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM AM_CFLAGS += $(WAYLAND_CFLAGS) +libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS) endif if HAVE_DRI @@ -38,7 +39,7 @@ libgbm_dri_la_CFLAGS = \ $(LIBDRM_CFLAGS) libgbm_la_LIBADD += \ - libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la + libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la $(LIBDRM_LIBS) endif all-local: libgbm.la |