Commit 3e9df072 authored by Daiki Ueno's avatar Daiki Ueno Committed by Kristian H. Kristensen

autotools: Don't use wayland-scanner.m4

parent 58bcc362
......@@ -6,4 +6,4 @@ SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man
DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
EXTRA_DIST = weston.ini
EXTRA_DIST = weston.ini wayland-scanner.mk
......@@ -254,7 +254,8 @@ endif
endif
@wayland_scanner_rules@
wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk
if HAVE_POPPLER
poppler_programs = weston-view
......
......@@ -423,9 +423,8 @@ if test "x$have_lcms" = xyes; then
fi
AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
m4_ifndef([WAYLAND_SCANNER_RULES],
[m4_fatal([WAYLAND_SCANNER_RULES not found. Point ACLOCAL to wayland-scanner.m4 before running autoconf/autogen])])
WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
AC_PATH_PROG([wayland_scanner], [wayland-scanner],
[AC_MSG_ERROR("wayland-scanner is needed to compile weston")])
AC_CONFIG_FILES([Makefile
shared/Makefile
......
......@@ -314,4 +314,5 @@ BUILT_SOURCES = \
CLEANFILES = $(BUILT_SOURCES)
@wayland_scanner_rules@
wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk
......@@ -35,4 +35,5 @@ BUILT_SOURCES = \
CLEANFILES = $(BUILT_SOURCES)
@wayland_scanner_rules@
wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk
......@@ -139,4 +139,5 @@ BUILT_SOURCES = \
CLEANFILES = $(BUILT_SOURCES)
@wayland_scanner_rules@
wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk
%-protocol.c : $(wayland_protocoldir)/%.xml
$(AM_V_GEN)$(wayland_scanner) code < $< > $@
%-server-protocol.h : $(wayland_protocoldir)/%.xml
$(AM_V_GEN)$(wayland_scanner) server-header < $< > $@
%-client-protocol.h : $(wayland_protocoldir)/%.xml
$(AM_V_GEN)$(wayland_scanner) client-header < $< > $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment