[Libva] [PATCH v2 2/2] Fix error caused by 'make distclean' with wayland disabled

[Xiang, Haihao]

This is based on Mesa's 426a23af147720ae3b89995ffee792a29e8ae2db.

v2: cleanup va/wayland/Makefile.am and nuke va/wayland/protocol/Makefile.am (Emil)

Cc: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Xiang, Haihao <haihao.xiang at intel.com>
---
 configure.ac                              |  8 ++++----
 va/wayland/Makefile.am                    |  9 ++++++---
 va/wayland/protocol/Makefile.am           | 28 ----------------------------
 va/wayland/{protocol => }/wayland-drm.xml |  0
 4 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100644 va/wayland/protocol/Makefile.am
 rename va/wayland/{protocol => }/wayland-drm.xml (100%)

diff --git a/configure.ac b/configure.ac
index b54eafe..6df246d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,9 +273,10 @@ if test "$enable_wayland" = "yes"; then
     PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version],
         [USE_WAYLAND="yes"], [:])
     if test "$USE_WAYLAND" = "yes"; then
-        m4_ifdef([WAYLAND_SCANNER_RULES],
-            [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
-            [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
+
+        WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
+        AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],,
+                     [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
 
         AC_DEFINE([HAVE_VA_WAYLAND], [1],
                   [Defined to 1 if VA/Wayland API is built])
@@ -337,7 +338,6 @@ debian.upstream/libva-x11.install.in
     va/glx/Makefile
     va/va_version.h
     va/wayland/Makefile
-    va/wayland/protocol/Makefile
     va/x11/Makefile
 ])
 
diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
index ca6c594..4f8262c 100644
--- a/va/wayland/Makefile.am
+++ b/va/wayland/Makefile.am
@@ -20,8 +20,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-SUBDIRS = protocol
-
 AM_CPPFLAGS = \
 	-DLINUX			\
 	-I$(top_srcdir)		\
@@ -60,7 +58,12 @@ noinst_HEADERS			= $(source_h_priv)
 
 # Wayland protocol
 va_wayland_drm.c: $(protocol_source_h)
- at wayland_scanner_rules@
+%-client-protocol.h : %.xml
+	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+
+EXTRA_DIST = \
+	wayland-drm.xml         \
+	$(NULL)
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/va/wayland/protocol/Makefile.am b/va/wayland/protocol/Makefile.am
deleted file mode 100644
index 614d8a4..0000000
--- a/va/wayland/protocol/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2012 Intel Corporation. All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sub license, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice (including the
-# next paragraph) shall be included in all copies or substantial portions
-# of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-EXTRA_DIST = \
-	wayland-drm.xml		\
-	$(NULL)
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/va/wayland/protocol/wayland-drm.xml b/va/wayland/wayland-drm.xml
similarity index 100%
rename from va/wayland/protocol/wayland-drm.xml
rename to va/wayland/wayland-drm.xml
-- 
1.9.1