From 3ee16a2abb02229c27adc42b443a18fb1c631caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 25 Jan 2016 17:37:58 +0800 Subject: [PATCH] src/Makefile.am: Pass protocol file to wayland-scanner as an argument Instead of piping the protocol file content to wayland-scanner, pass the file name as an argument. This enables a new enough wayland-scanner to print more meaningful error messages. https://bugzilla.gnome.org/show_bug.cgi?id=769936 --- src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 891d8c45a..4a54eed05 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -574,10 +574,10 @@ $(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/') endef %-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ + $(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@ %-server-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@ + $(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@ %-protocol.c : $(srcdir)/wayland/protocol/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ + $(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@ %-server-protocol.h : $(srcdir)/wayland/protocol/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@ + $(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@