Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
weston
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pekka Paalanen
weston
Commits
64db37e5
Commit
64db37e5
authored
11 years ago
by
Peter Hutterer
Committed by
Kristian Høgsberg
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
protocol: hook up xmllint to check validity
parent
c85f1d45
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+11
-0
11 additions, 0 deletions
configure.ac
protocol/Makefile.am
+16
-1
16 additions, 1 deletion
protocol/Makefile.am
with
27 additions
and
1 deletion
configure.ac
+
11
−
0
View file @
64db37e5
...
...
@@ -474,6 +474,17 @@ if test x$wayland_scanner = x; then
AC_MSG_ERROR([wayland-scanner is needed to compile weston])
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
shared/Makefile
src/Makefile
...
...
This diff is collapsed.
Click to expand it.
protocol/Makefile.am
+
16
−
1
View file @
64db37e5
EXTRA_DIST
=
\
protocol_sources
=
\
desktop-shell.xml
\
screenshooter.xml
\
tablet-shell.xml
\
...
...
@@ -9,3 +9,18 @@ EXTRA_DIST = \
subsurface.xml
\
text-cursor-position.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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment