From 6292fe2af6a45decb7fd39090e74dd87bc4e22b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 18 Feb 2014 14:52:00 -0800 Subject: [PATCH] build: Stop using xmllint to validate protocol files Same reason as commit cd31275f28b0a04d2ec5426dc81e875197b47e52 from weston: The scanner needs to be good enough. If it crashes or fails to report invalid input, that needs to get fixed. --- configure.ac | 3 --- protocol/Makefile.am | 13 ------------- 2 files changed, 16 deletions(-) diff --git a/configure.ac b/configure.ac index 85b19e0..7be5d8f 100644 --- a/configure.ac +++ b/configure.ac @@ -87,9 +87,6 @@ fi AC_PATH_PROG(XSLTPROC, xsltproc) AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) -AC_PATH_PROG(XMLLINT, xmllint) -AM_CONDITIONAL([HAVE_XMLLINT], [test "x$XMLLINT" != "x"]) - AC_MSG_CHECKING([for docbook manpages stylesheet]) MANPAGES_STYLESHEET=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl AC_PATH_PROGS_FEATURE_CHECK([XSLTPROC_TMP], [xsltproc], diff --git a/protocol/Makefile.am b/protocol/Makefile.am index e8b6290..9dca324 100644 --- a/protocol/Makefile.am +++ b/protocol/Makefile.am @@ -1,14 +1 @@ dist_pkgdata_DATA = wayland.xml wayland.dtd - -if HAVE_XMLLINT -.PHONY: validate - -.%.xml.valid: %.xml - $(AM_V_GEN)$(XMLLINT) --noout --dtdvalid $(srcdir)/wayland.dtd $^ > $@ - -validate: .wayland.xml.valid - -all-local: validate - -CLEANFILES = .wayland.xml.valid -endif -- 2.7.4