[Libva] [libva-intel-driver PATCH] Fix the broken out of tree builds

[Zhao, Yakui]

On Sun, 2014-12-14 at 21:30 -0700, Xiang, Haihao wrote:
> Signed-off-by: Xiang, Haihao <haihao.xiang at intel.com>

This looks good to me.

Reviewed-by: Zhao, Yakui <yakui.zhao at intel.com>

> ---
>  src/shaders/post_processing/gen9/Makefile.am | 6 +++---
>  src/shaders/render/Makefile.am               | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/shaders/post_processing/gen9/Makefile.am b/src/shaders/post_processing/gen9/Makefile.am
> index 9b94bc5..1e32dff 100644
> --- a/src/shaders/post_processing/gen9/Makefile.am
> +++ b/src/shaders/post_processing/gen9/Makefile.am
> @@ -1,4 +1,4 @@
> -SRCDIR = ../gen8/
> +SRCDIR = $(top_srcdir)/src/shaders/post_processing/gen8
>  VPATH = $(SRCDIR)
>  
>  INTEL_PP_G9B = \
> @@ -59,10 +59,10 @@ SUFFIXES = .g9b .g9s .asm
>  $(INTEL_PP_GEN9_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G9A)
>  .asm.g9s:
>  	$(AM_V_GEN)cpp $< > _pp0.$@;		\
> -	../../gpp.py _pp0.$@ $@;		\
> +	$(PYTHON2) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
>  	rm _pp0.$@
>  .g9s.g9b:
> -	$(AM_V_GEN)intel-gen4asm -a -o $@ -g 9 $<
> +	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 9 $<
>  
>  CLEANFILES = $(INTEL_PP_GEN9_ASM)
>  
> diff --git a/src/shaders/render/Makefile.am b/src/shaders/render/Makefile.am
> index 5fd2b56..eef6108 100644
> --- a/src/shaders/render/Makefile.am
> +++ b/src/shaders/render/Makefile.am
> @@ -170,7 +170,7 @@ $(INTEL_G8S): $(INTEL_G8A) $(INTEL_G8I)
>  
>  $(INTEL_G9S): $(INTEL_G9A) $(INTEL_G9I)
>  .g9a.g9s:
> -	$(AM_V_GEN)m4 $< > $@
> +	$(AM_V_GEN)m4 -I$(srcdir) $< > $@
>  .g9s.g9b:
>  	$(AM_V_GEN)$(GEN4ASM) -g 9 -o $@ $<
>