diff options
| author | Emil Velikov <[email protected]> | 2017-09-01 17:39:36 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-09-19 19:02:34 +0100 |
| commit | 2785090a2ae9d959ce87e40629281a8079fd2f49 (patch) | |
| tree | a336febaff46fb82542c30d03224485ad649bcea /src/egl/Makefile.am | |
| parent | 1d0be5b3fe548ee33d4520092f583c76d42510a6 (diff) | |
configure.ac: split the wayland client/server confusion
At the moment wayland-clients, such as the Vulkan drivers were
over-linking against libwayland-server.so.
That went unnoticed, since both client and server code uses the
wl*interface symbols, which are present in both libwayland-client.so and
libwayland-server.so.
I've looked at correcting that, although that's orthogonal to this fix.
Note: wayland-egl does _not_ depend on wayland-client, although it does
need wayland-egl.h. There's no distinct package that provides it (I have
a WIP on the topic) so current solution will do for now.
v2: Rebase with the "...inline wayland_drm_buffer_get" patch removed.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Daniel Stone <[email protected]>
Diffstat (limited to 'src/egl/Makefile.am')
| -rw-r--r-- | src/egl/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 8ff1ffaba18..f140f5d6412 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -79,10 +79,12 @@ if HAVE_PLATFORM_WAYLAND drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h -AM_CFLAGS += $(WAYLAND_CFLAGS) -libEGL_common_la_LIBADD += $(WAYLAND_LIBS) +AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS) +libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS) libEGL_common_la_LIBADD += $(LIBDRM_LIBS) +AM_CFLAGS += $(WAYLAND_SERVER_CFLAGS) libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la +libEGL_common_la_LIBADD += $(WAYLAND_SERVER_LIBS) dri2_backend_FILES += \ drivers/dri2/platform_wayland.c \ drivers/dri2/linux-dmabuf-unstable-v1-protocol.c \ |