build: use public-code when using the local wayland-scanner
authorEmil Velikov <emil.velikov@collabora.com>
Fri, 16 Feb 2018 16:22:31 +0000 (16:22 +0000)
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>
Thu, 22 Feb 2018 09:56:57 +0000 (11:56 +0200)
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@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Makefile.am

index 322d6b8..4ffce0d 100644 (file)
@@ -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 $< $@