[Libva] [PATCH 1/2] Generate wayland related files even if wayland disabled

Xiang, Haihao haihao.xiang at intel.com
Thu Dec 10 11:58:46 PST 2015


This fixes the regression caused by commit 883ce46

Making all in debian.upstream
make[2]: Entering directory '/home/uaeoff/Work/workspace/media/build/libva/debian.upstream'
make[2]: *** No rule to make target 'libva-wayland1.install', needed by 'all-am'.  Stop.
make[2]: Leaving directory '/home/uaeoff/Work/workspace/media/build/libva/debian.upstream'
Makefile:453: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/home/uaeoff/Work/workspace/media/build/libva'
Makefile:384: recipe for target 'all' failed
make: *** [all] Error 2

Reported-by: Eoff, Ullysses A <ullysses.a.eoff at intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang at intel.com>
---
 configure.ac | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index f835bef..b54eafe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,6 +310,8 @@ debian.upstream/libva-drm.install.in
 debian.upstream/libva-egl.install.in
     debian.upstream/libva-glx$LIBVA_MAJOR_VERSION.install:\
 debian.upstream/libva-glx.install.in
+    debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\
+debian.upstream/libva-wayland.install.in
     debian.upstream/libva-x11-$LIBVA_MAJOR_VERSION.install:\
 debian.upstream/libva-x11.install.in
     doc/Makefile
@@ -319,6 +321,7 @@ debian.upstream/libva-x11.install.in
     pkgconfig/libva-egl.pc
     pkgconfig/libva-glx.pc
     pkgconfig/libva-tpi.pc
+    pkgconfig/libva-wayland.pc
     pkgconfig/libva-x11.pc
     pkgconfig/libva.pc
     test/Makefile
@@ -333,18 +336,10 @@ debian.upstream/libva-x11.install.in
     va/egl/Makefile
     va/glx/Makefile
     va/va_version.h
-    va/x11/Makefile
-])
-
-if test "$USE_WAYLAND" = "yes"; then
-AC_OUTPUT([
-    debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\
-debian.upstream/libva-wayland.install.in
-    pkgconfig/libva-wayland.pc
     va/wayland/Makefile
     va/wayland/protocol/Makefile
+    va/x11/Makefile
 ])
-fi
 
 # Print a small summary
 BACKENDS=""
-- 
1.9.1



More information about the Libva mailing list