[Libva] [PATCH 6/9] post-processing: fix out of tree builds

Emil Velikov emil.l.velikov at gmail.com
Thu Sep 18 09:45:44 PDT 2014


 - add missing prefix for gpp.py
 - include the source directories, rather than the build ones.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/shaders/post_processing/gen5_6/Makefile.am | 8 ++++----
 src/shaders/post_processing/gen7/Makefile.am   | 2 +-
 src/shaders/post_processing/gen8/Makefile.am   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/shaders/post_processing/gen5_6/Makefile.am b/src/shaders/post_processing/gen5_6/Makefile.am
index 4a13d9d..af515ae 100755
--- a/src/shaders/post_processing/gen5_6/Makefile.am
+++ b/src/shaders/post_processing/gen5_6/Makefile.am
@@ -199,16 +199,16 @@ $(INTEL_G4B): $(INTEL_G4I)
 
 $(INTEL_PP_GEN5_ASM): $(INTEL_PP_ASM)
 .asm.g5s:
-	$(AM_V_GEN)cpp -D DEV_ILK -I Common/ -I Core_Kernels $< > _pp0.$@; \
-	../../gpp.py _pp0.$@ $@; \
+	$(AM_V_GEN)cpp -D DEV_ILK -I $(srcdir)/Common/ -I $(srcdir)/Core_Kernels $< > _pp0.$@; \
+	$(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@; \
 	rm _pp0.$@
 .g5s.g4b.gen5:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 5 $<
 
 $(INTEL_PP_GEN6_ASM): $(INTEL_PP_ASM)
 .asm.g6s:
-	$(AM_V_GEN)cpp -D GT -I Common/ -I Core_Kernels $< > _pp0.$@; \
-	../../gpp.py _pp0.$@ $@; \
+	$(AM_V_GEN)cpp -D GT -I $(srcdir)/Common/ -I $(srcdir)/Core_Kernels $< > _pp0.$@; \
+	$(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@; \
 	rm _pp0.$@
 .g6s.g6b:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 6 $<
diff --git a/src/shaders/post_processing/gen7/Makefile.am b/src/shaders/post_processing/gen7/Makefile.am
index 1ffc1cd..d8f20dd 100644
--- a/src/shaders/post_processing/gen7/Makefile.am
+++ b/src/shaders/post_processing/gen7/Makefile.am
@@ -85,7 +85,7 @@ SUFFIXES = .g7b .g7s .asm
 $(INTEL_PP_GEN7_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G4A)
 .asm.g7s:
 	$(AM_V_GEN)cpp $< > _pp0.$@;		\
-	../../gpp.py _pp0.$@ $@;	\
+	$(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
 	rm _pp0.$@
 .g7s.g7b:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 7 $<
diff --git a/src/shaders/post_processing/gen8/Makefile.am b/src/shaders/post_processing/gen8/Makefile.am
index 9898a45..4ebd77a 100644
--- a/src/shaders/post_processing/gen8/Makefile.am
+++ b/src/shaders/post_processing/gen8/Makefile.am
@@ -60,7 +60,7 @@ SUFFIXES = .g8b .g8s .asm
 $(INTEL_PP_GEN8_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G8A)
 .asm.g8s:
 	$(AM_V_GEN)cpp $< > _pp0.$@;		\
-	../../gpp.py _pp0.$@ $@;	\
+	$(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
 	rm _pp0.$@
 .g8s.g8b:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 8 $<
-- 
2.1.0



More information about the Libva mailing list