protocol: hook up xmllint to check validity
This commit is contained in:
committed by
Kristian Høgsberg
parent
c85f1d4595
commit
64db37e53c
@@ -474,6 +474,17 @@ if test x$wayland_scanner = x; then
|
|||||||
AC_MSG_ERROR([wayland-scanner is needed to compile weston])
|
AC_MSG_ERROR([wayland-scanner is needed to compile weston])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
|
||||||
|
AC_PATH_PROG(XMLLINT, xmllint)
|
||||||
|
AC_ARG_WITH([dtddir],
|
||||||
|
AS_HELP_STRING([--with-dtddir],
|
||||||
|
[Directory containing the Wayland
|
||||||
|
protocol DTD @<:@default=from pkgconfig@:>@]),
|
||||||
|
[dtddir="$withval"],
|
||||||
|
[dtddir=$($PKG_CONFIG --variable=pkgdatadir wayland-scanner)])
|
||||||
|
AC_SUBST([dtddir])
|
||||||
|
AM_CONDITIONAL([HAVE_XMLLINT], [test "x$XMLLINT" != "x" -a "x$dtddir" != "x"])
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile
|
AC_CONFIG_FILES([Makefile
|
||||||
shared/Makefile
|
shared/Makefile
|
||||||
src/Makefile
|
src/Makefile
|
||||||
|
|||||||
+16
-1
@@ -1,4 +1,4 @@
|
|||||||
EXTRA_DIST = \
|
protocol_sources = \
|
||||||
desktop-shell.xml \
|
desktop-shell.xml \
|
||||||
screenshooter.xml \
|
screenshooter.xml \
|
||||||
tablet-shell.xml \
|
tablet-shell.xml \
|
||||||
@@ -9,3 +9,18 @@ EXTRA_DIST = \
|
|||||||
subsurface.xml \
|
subsurface.xml \
|
||||||
text-cursor-position.xml \
|
text-cursor-position.xml \
|
||||||
wayland-test.xml
|
wayland-test.xml
|
||||||
|
|
||||||
|
if HAVE_XMLLINT
|
||||||
|
.PHONY: validate
|
||||||
|
|
||||||
|
.%.xml.valid: %.xml
|
||||||
|
$(AM_V_GEN)$(XMLLINT) --noout --dtdvalid $(dtddir)/wayland.dtd $^ > $@
|
||||||
|
|
||||||
|
validate: $(protocol_sources:%.xml=.%.xml.valid)
|
||||||
|
|
||||||
|
all-local: validate
|
||||||
|
|
||||||
|
CLEANFILES= $(protocol_sources:%.xml=.%.xml.valid)
|
||||||
|
EXTRA_DIST=$(protocol_sources)
|
||||||
|
|
||||||
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user