[PATCH wayland 1/3] Pass input/output files as arguments to wayland-scanner

Jonas Ådahl jadahl at gmail.com
Mon Jul 3 09:16:44 UTC 2017


When input/output files are passed as arguments to wayland-scanner,
instead of using stdin/stdout, warning and error messages will contain
the file name, together with line number, of the warning/error. Doing
this helps IDEs jump to the correct line.

Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
---
 Makefile.am        | 6 +++---
 src/scanner.mk     | 6 +++---
 wayland-scanner.mk | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d0c8bd3..fdc5689 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,13 +97,13 @@ nodist_libwayland_client_la_SOURCES =		\
 pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
 
 protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code $< $@
 
 protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header < $< > $@
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header $< $@
 
 protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header $< $@
 
 protocol/%-server-protocol-core.h : $(top_srcdir)/protocol/%.xml
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header -c < $< > $@
diff --git a/src/scanner.mk b/src/scanner.mk
index 1b6963c..e01b839 100644
--- a/src/scanner.mk
+++ b/src/scanner.mk
@@ -1,8 +1,8 @@
 %-protocol.c : $(protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) code < $< > $@
+	$(AM_V_GEN)$(wayland_scanner) code $< $@
 
 %-server-protocol.h : $(protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) server-header < $< > $@
+	$(AM_V_GEN)$(wayland_scanner) server-header $< $@
 
 %-client-protocol.h : $(protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) client-header < $< > $@
+	$(AM_V_GEN)$(wayland_scanner) client-header $< $@
diff --git a/wayland-scanner.mk b/wayland-scanner.mk
index 0a72062..c174e6b 100644
--- a/wayland-scanner.mk
+++ b/wayland-scanner.mk
@@ -1,8 +1,8 @@
 %-protocol.c : $(wayland_protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) code < $< > $@
+	$(AM_V_GEN)$(wayland_scanner) code $< $@
 
 %-server-protocol.h : $(wayland_protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) server-header < $< > $@
+	$(AM_V_GEN)$(wayland_scanner) server-header $< $@
 
 %-client-protocol.h : $(wayland_protocoldir)/%.xml
-	$(AM_V_GEN)$(wayland_scanner) client-header < $< > $@
+	$(AM_V_GEN)$(wayland_scanner) client-header $< $@
-- 
2.13.0



More information about the wayland-devel mailing list