Commit: 5fdfdf40ac95a083459c8a7a40c28d91dcffdea1 - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

Commit MetaInfo

• Revision: 5fdfdf40ac95a083459c8a7a40c28d91dcffdea1 (tree)
• Time: 2014-12-15 13:53:30
• Author: Xiang, Haihao <haihao.xiang@inte...>
• Commiter: Xiang, Haihao

Log Message

Fix the broken out of tree builds

Signed-off-by: Xiang, Haihao <[e-mail]>
Reviewed-by: Zhao, Yakui <[e-mail]>

Change Summary

• modified: src/shaders/post_processing/gen9/Makefile.am
• modified: src/shaders/render/Makefile.am

Incremental Difference

--- 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)
 

--- 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 $@ $<