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

[Pekka Paalanen]

On Fri, 16 Feb 2018 16:22:31 +0000
Emil Velikov <emil.l.velikov at gmail.com> wrote:

> 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 $< $@

Hi,

personally I would be ok requiring the exact same wayland-scanner
version as what libwayland one is building, but we never explicitly
enforced that.

Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20180222/c954d17d/attachment.sig>