[PATCH wayland 2/4] build: use public-code when using the local wayland-scanner

Emil Velikov emil.l.velikov at gmail.com
Fri Feb 16 16:22:31 UTC 2018


From: Emil Velikov <emil.velikov at collabora.com>

The core wayland interfaces are public, via the libwayland-server and
libwayland-client DSOs. Hence use "public-code" cmdline option, instead
of the deprecated code".

As the host wayland-scanner may not know about the new option, use the
legacy "code".

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 322d6b8..4ffce0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,7 +95,11 @@ nodist_libwayland_client_la_SOURCES =		\
 pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
 
 protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml
+if USE_HOST_SCANNER
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code $< $@
+else
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) public-code $< $@
+endif
 
 protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header $< $@
-- 
2.16.0



More information about the wayland-devel mailing list