diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2017-07-03 17:16:44 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2017-08-18 15:20:24 +0300 |
| commit | b88ada076094ba160ff58229de1259e0e2a26c3a (patch) | |
| tree | 551150417aed77c99b09b9b597e8ec9745d93b8b | |
| parent | 22be3c7b90ef6156f7793d36d341777222d5e36c (diff) | |
Pass input/output files as arguments to wayland-scanner
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@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
[Pekka: dropped the src/scanner.mk hunk, file deleted]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | wayland-scanner.mk | 6 |
2 files changed, 6 insertions, 6 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/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 $< $@ |