build: use GEN4ASM variable to hold path to intel-gen4asm program.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/configure.ac b/configure.ac
index 5cca060..85164fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ AC_SUBST(LIBDRM_VERSION)
 dnl Check for gen4asm
 PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.2], [gen4asm=yes], [gen4asm=no])
 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+AC_PATH_PROG([GEN4ASM], [intel-gen4asm])
 
 dnl Check for VA-API
 PKG_CHECK_MODULES(LIBVA_DEPS,    [libva])

diff --git a/src/shaders/h264/mc/Makefile.am b/src/shaders/h264/mc/Makefile.am
index e514801..dd37a92 100644 (file)
--- a/src/shaders/h264/mc/Makefile.am
+++ b/src/shaders/h264/mc/Makefile.am
@@ -179,14 +179,14 @@ SUFFIXES = .g4a .g4b .gen5.asm
 
 .g4a.g4b:
        m4 $*.g4a > $*.g4m                      && \
-       intel-gen4asm -o $@ $*.g4m              && \
-       intel-gen4asm -g 5 -o $@.gen5 $*.g4m    && \
+       $(GEN4ASM) -o $@ $*.g4m                 && \
+       $(GEN4ASM) -g 5 -o $@.gen5 $*.g4m       && \
        rm $*.g4m
 
 $(INTEL_MC_GEN5_ASM): $(INTEL_MC_ASM) $(INTEL_MC_INC) $(INTEL_ILDB_ASM)
        cpp -DDEV_ILK -DBOOTSTRAP -I ../ildb/ AllAVC.asm > _mc0.$@      && \
        ../../gpp.py _mc0.$@ $@                                         && \
-       intel-gen4asm -l list -a -e tmp.$(INTEL_MC_EXPORT_GEN5) -g 5 $@    \
+       $(GEN4ASM) -l list -a -e tmp.$(INTEL_MC_EXPORT_GEN5) -g 5 $@       \
                -o /dev/null                                            && \
        mv tmp.$(INTEL_MC_EXPORT_GEN5) $(INTEL_MC_EXPORT_GEN5)          && \
        cpp -DDEV_ILK -I ../ildb/ AllAVC.asm > _mc1.$@                  && \
@@ -194,7 +194,7 @@ $(INTEL_MC_GEN5_ASM): $(INTEL_MC_ASM) $(INTEL_MC_INC) $(INTEL_ILDB_ASM)
        rm _mc0.$@ _mc1.$@
 
 $(INTEL_MC_G4B_GEN5): $(INTEL_MC_GEN5_ASM)
-       intel-gen4asm -l list -a -e tmp.$(INTEL_MC_EXPORT_GEN5) -g 5 $<    \
+       $(GEN4ASM) -l list -a -e tmp.$(INTEL_MC_EXPORT_GEN5) -g 5 $<       \
                -o $@                                                   && \
        cat tmp.$(INTEL_MC_EXPORT_GEN5) | sed "s/_IP/_IP_GEN5/g"           \
                > $(INTEL_MC_EXPORT_GEN5)                               && \

diff --git a/src/shaders/mpeg2/vld/Makefile.am b/src/shaders/mpeg2/vld/Makefile.am
index ed5f997..81c4050 100644 (file)
--- a/src/shaders/mpeg2/vld/Makefile.am
+++ b/src/shaders/mpeg2/vld/Makefile.am
@@ -103,9 +103,9 @@ $(INTEL_G4S): $(INTEL_G4A) $(INTEL_G4I)
 .g4a.g4s:
        m4 $< > $@
 .g4s.g4b:
-       intel-gen4asm -o $@ $<
+       $(GEN4ASM) -o $@ $<
 .g4s.g4b.gen5:
-       intel-gen4asm -g 5 -o $@ $<
+       $(GEN4ASM) -g 5 -o $@ $<
 
 CLEANFILES = $(INTEL_G4S)
 

diff --git a/src/shaders/post_processing/Makefile.am b/src/shaders/post_processing/Makefile.am
index a6fc525..75a01f6 100644 (file)
--- a/src/shaders/post_processing/Makefile.am
+++ b/src/shaders/post_processing/Makefile.am
@@ -144,13 +144,13 @@ SUFFIXES = .g4a .g4b .g6a .g6b .g5s .g6s .asm
 
 .g4a.g4b:
        m4 $*.g4a > $*.g4m                      && \
-       intel-gen4asm -o $@ $*.g4m              && \
-       intel-gen4asm -g 5 -o $@.gen5 $*.g4m    && \
+       $(GEN4ASM) -o $@ $*.g4m         && \
+       $(GEN4ASM) -g 5 -o $@.gen5 $*.g4m       && \
        rm $*.g4m
 
 .g6a.g6b:
        m4 $< > $*.g6m                          && \
-       intel-gen4asm -g 6 -o $@ $*.g6m         && \
+       $(GEN4ASM) -g 6 -o $@ $*.g6m            && \
        rm $*.g6m
 
 $(INTEL_G4B): $(INTEL_G4I)
@@ -161,7 +161,7 @@ $(INTEL_PP_GEN5_ASM): $(INTEL_PP_ASM)
        ../gpp.py _pp0.$@ $@; \
        rm _pp0.$@
 .g5s.g4b.gen5:
-       intel-gen4asm -a -o $@ -g 5 $<
+       $(GEN4ASM) -a -o $@ -g 5 $<
 
 $(INTEL_PP_GEN6_ASM): $(INTEL_PP_ASM)
 .asm.g6s:
@@ -169,7 +169,7 @@ $(INTEL_PP_GEN6_ASM): $(INTEL_PP_ASM)
        ../gpp.py _pp0.$@ $@; \
        rm _pp0.$@
 .g6s.g6b:
-       intel-gen4asm -a -o $@ -g 6 $<
+       $(GEN4ASM) -a -o $@ -g 6 $<
 
 CLEANFILES = $(INTEL_PP_GEN5_ASM) $(INTEL_PP_GEN6_ASM)
 

diff --git a/src/shaders/render/Makefile.am b/src/shaders/render/Makefile.am
index 7b228f9..b3a56ea 100644 (file)
--- a/src/shaders/render/Makefile.am
+++ b/src/shaders/render/Makefile.am
@@ -80,21 +80,21 @@ $(INTEL_G4S): $(INTEL_G4A) $(INTEL_G4I)
 .g4a.g4s:
        m4 $< > $@
 .g4s.g4b:
-       intel-gen4asm -o $@ $<
+       $(GEN4ASM) -o $@ $<
 .g4s.g4b.gen5:
-       intel-gen4asm -g 5 -o $@ $<
+       $(GEN4ASM) -g 5 -o $@ $<
 
 $(INTEL_G6S): $(INTEL_G6A) $(INTEL_G6I)
 .g6a.g6s:
        m4 $< > $@
 .g6s.g6b:
-       intel-gen4asm -g 6 -o $@ $<
+       $(GEN4ASM) -g 6 -o $@ $<
 
 $(INTEL_G7S): $(INTEL_G7A) $(INTEL_G7I)
 .g7a.g7s:
        m4 $< > $@
 .g7s.g7b:
-       intel-gen4asm -g 7 -o $@ $<
+       $(GEN4ASM) -g 7 -o $@ $<
 
 CLEANFILES = \
        $(INTEL_G4S)            \

diff --git a/src/shaders/vme/Makefile.am b/src/shaders/vme/Makefile.am
index ac7f1b4..3acfd04 100644 (file)
--- a/src/shaders/vme/Makefile.am
+++ b/src/shaders/vme/Makefile.am
@@ -24,13 +24,13 @@ $(INTEL_GEN6_ASM): $(VME_CORE) $(INTEL_GEN6_INC)
 .g6a.gen6.asm:
        m4 $< > $@
 .gen6.asm.g6b:
-       intel-gen4asm -g 6 -o $@ $<
+       $(GEN4ASM) -g 6 -o $@ $<
 
 $(INTEL_GEN7_ASM): $(VME_CORE) $(INTEL_GEN7_INC)
 .g7a.gen7.asm:
        m4 $< > $@
 .gen7.asm.g7b:
-       intel-gen4asm -g 7 -o $@ $<
+       $(GEN4ASM) -g 7 -o $@ $<
 
 CLEANFILES = $(INTEL_GEN6_ASM) $(INTEL_GEN7_ASM)