mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-21 06:59:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add configure option to disable scanner compilation

Browse source 
When cross-compiling Wayland, wayland-scanner should be picked up from
the host system instead of compiling and trying to run e.g. ARM
wayland-scanner on X86.

This patch adds --disable-scanner option for disabling the scanner
from the build and using existing wayland-scanner instead (from PATH)
which should help in most cross-compilation systems.

By default everything works as before.

Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
This commit is contained in:
jani.uusi-rantala@nokia.com 2011-05-06 06:13:36 +00:00 • committed by Kristian Høgsberg
parent bd70dc185a
commit 53200f05c7
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
wayland/Makefile.am
View file

@ -35,9 +35,16 @@ AM_CPPFLAGS = $(FFI_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS)
protocoldir = $(top_srcdir)/protocol
if ENABLE_SCANNER
wayland_scanner = $(top_builddir)/wayland/wayland-scanner
else
wayland_scanner = wayland-scanner
endif
include $(top_srcdir)/wayland/scanner.mk
if ENABLE_SCANNER
bin_PROGRAMS = wayland-scanner
wayland_scanner_SOURCES = \
@ -46,6 +53,7 @@ wayland_scanner_SOURCES = \
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
$(BUILT_SOURCES) : wayland-scanner
endif
BUILT_SOURCES = \
wayland-server-protocol.h \