mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autotools: Don't use wayland-scanner.m4

Browse Source
This commit is contained in:
Daiki Ueno 2013-08-20 09:56:52 +02:00 committed by Kristian Høgsberg
parent 58bcc362a7
commit 3e9df07269
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -6,4 +6,4 @@ SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man
DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
EXTRA_DIST = weston.ini EXTRA_DIST = weston.ini wayland-scanner.mk

3
clients/Makefile.am
View File

@ -254,7 +254,8 @@ endif
endif endif
@wayland_scanner_rules@ wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk
if HAVE_POPPLER if HAVE_POPPLER
poppler_programs = weston-view poppler_programs = weston-view

5
configure.ac
View File

@ -423,9 +423,8 @@ if test "x$have_lcms" = xyes; then
fi fi
AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
m4_ifndef([WAYLAND_SCANNER_RULES], AC_PATH_PROG([wayland_scanner], [wayland-scanner],
[m4_fatal([WAYLAND_SCANNER_RULES not found. Point ACLOCAL to wayland-scanner.m4 before running autoconf/autogen])]) [AC_MSG_ERROR("wayland-scanner is needed to compile weston")])
WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
shared/Makefile shared/Makefile

3
src/Makefile.am
View File

@ -314,4 +314,5 @@ BUILT_SOURCES = \
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
@wayland_scanner_rules@ wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk

3
src/xwayland/Makefile.am
View File

@ -35,4 +35,5 @@ BUILT_SOURCES = \
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
@wayland_scanner_rules@ wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk

3
tests/Makefile.am
View File

@ -139,4 +139,5 @@ BUILT_SOURCES = \
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
@wayland_scanner_rules@ wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk

8
wayland-scanner.mk Normal file
View File

@ -0,0 +1,8 @@
%-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 < $< > $@