From ff856b7688dbf5af1680d38e33932929262b9f93 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Tue, 9 Sep 2014 15:04:43 +0200 Subject: build: fix make dist for packaging. 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 (cherry picked from commit 238d8077705711036d62a6d536311def3ef35035) --- 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) -- cgit v1.2.3