From ab6b156920ced7dfac94e01cada216171b619891 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 16 Feb 2018 16:22:31 +0000 Subject: [PATCH] build: use public-code when using the local wayland-scanner 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 Reviewed-by: Pekka Paalanen Reviewed-by: Derek Foreman --- 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.7.4