[Libva] [PATCH] build: fix make dist for packaging.

[Gwenole Beauchesne]

Pushed to git master and staging branches.

This needs to go to 1.4-branch too.

2014-09-09 15:21 GMT+02:00 Gwenole Beauchesne <gb.devel at gmail.com>:
> If the intel-gen4asm tool is not available, ship with the pre-built
> EU kernels instead of trying to regenerate them. In particular, just
> don't expose the build rules if intel-gen4asm is not installed.
>
> Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
> ---
>  src/shaders/post_processing/gen7/Makefile.am |    2 ++
>  src/shaders/post_processing/gen8/Makefile.am |    2 ++
>  2 files changed, 4 insertions(+)
>
> diff --git a/src/shaders/post_processing/gen7/Makefile.am b/src/shaders/post_processing/gen7/Makefile.am
> index 1ffc1cd..f4e2a8d 100644
> --- a/src/shaders/post_processing/gen7/Makefile.am
> +++ b/src/shaders/post_processing/gen7/Makefile.am
> @@ -82,6 +82,7 @@ all-local: $(TARGETS)
>
>  SUFFIXES = .g7b .g7s .asm
>
> +if HAVE_GEN4ASM
>  $(INTEL_PP_GEN7_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G4A)
>  .asm.g7s:
>         $(AM_V_GEN)cpp $< > _pp0.$@;            \
> @@ -92,6 +93,7 @@ $(INTEL_PP_GEN7_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G4A)
>
>  .g7s.g75b:
>         $(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 7.5 $<
> +endif
>
>  CLEANFILES = $(INTEL_PP_GEN7_ASM)
>
> diff --git a/src/shaders/post_processing/gen8/Makefile.am b/src/shaders/post_processing/gen8/Makefile.am
> index 9898a45..54533fc 100644
> --- a/src/shaders/post_processing/gen8/Makefile.am
> +++ b/src/shaders/post_processing/gen8/Makefile.am
> @@ -57,6 +57,7 @@ all-local: $(TARGETS)
>
>  SUFFIXES = .g8b .g8s .asm
>
> +if HAVE_GEN4ASM
>  $(INTEL_PP_GEN8_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G8A)
>  .asm.g8s:
>         $(AM_V_GEN)cpp $< > _pp0.$@;            \
> @@ -64,6 +65,7 @@ $(INTEL_PP_GEN8_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G8A)
>         rm _pp0.$@
>  .g8s.g8b:
>         $(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 8 $<
> +endif
>
>  CLEANFILES = $(INTEL_PP_GEN7_ASM)
>
> --
> 1.7.9.5
>



-- 
Gwenole Beauchesne
Intel Corporation SAS / 2 rue de Paris, 92196 Meudon Cedex, France
Registration Number (RCS): Nanterre B 302 456 199