AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Pass input/output files as arguments to wayland-scanner

Browse Source 
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>
This commit is contained in:
Jonas Ådahl 2017-07-03 17:16:44 +08:00 committed by Pekka Paalanen
parent 22be3c7b90
commit b88ada0760
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -97,13 +97,13 @@ nodist_libwayland_client_la_SOURCES = \
pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml 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 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 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 protocol/%-server-protocol-core.h : $(top_srcdir)/protocol/%.xml
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header -c < $< > $@ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header -c < $< > $@

6
wayland-scanner.mk
View File

@ -1,8 +1,8 @@
%-protocol.c : $(wayland_protocoldir)/%.xml %-protocol.c : $(wayland_protocoldir)/%.xml
$(AM_V_GEN)$(wayland_scanner) code < $< > $@ $(AM_V_GEN)$(wayland_scanner) code $< $@
%-server-protocol.h : $(wayland_protocoldir)/%.xml %-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 %-client-protocol.h : $(wayland_protocoldir)/%.xml
$(AM_V_GEN)$(wayland_scanner) client-header < $< > $@ $(AM_V_GEN)$(wayland_scanner) client-header $< $@