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/wayland | |
| 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/wayland')
| -rw-r--r-- | src/egl/wayland/wayland-drm/Makefile.am | 2 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-egl/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am index f40ff4841e0..b27edddafb1 100644 --- a/src/egl/wayland/wayland-drm/Makefile.am +++ b/src/egl/wayland/wayland-drm/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = -I$(top_srcdir)/src/egl/main \ -I$(top_srcdir)/include \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ - $(WAYLAND_CFLAGS) + $(WAYLAND_SERVER_CFLAGS) noinst_LTLIBRARIES = libwayland-drm.la libwayland_drm_la_SOURCES = \ diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am index 846fa6247b2..34394a17f0e 100644 --- a/src/egl/wayland/wayland-egl/Makefile.am +++ b/src/egl/wayland/wayland-egl/Makefile.am @@ -3,7 +3,7 @@ pkgconfig_DATA = wayland-egl.pc AM_CFLAGS = $(DEFINES) \ $(VISIBILITY_CFLAGS) \ - $(WAYLAND_CFLAGS) + $(WAYLAND_CLIENT_CFLAGS) lib_LTLIBRARIES = libwayland-egl.la noinst_HEADERS = wayland-egl-priv.h |