summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2011-10-17 14:58:05 +0200
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2011-10-17 15:04:15 +0200
commitdf452c90c2feb52c8a5ac393a7600af237da05c3 (patch)
tree931e2996d8ac14ae914a70f17327432e8c1a6853
parent51126d4dac5a9e68242b2d9dbf6a6b94b73330cb (diff)
build: use AM_V_GEN to generate files quietly.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-rw-r--r--debian.upstream/Makefile.am2
-rw-r--r--src/shaders/h264/mc/Makefile.am10
-rw-r--r--src/shaders/mpeg2/vld/Makefile.am6
-rw-r--r--src/shaders/post_processing/Makefile.am18
-rw-r--r--src/shaders/render/Makefile.am14
-rw-r--r--src/shaders/vme/Makefile.am8
6 files changed, 29 insertions, 29 deletions
diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am
index 4363ac7..679dab6 100644
--- a/debian.upstream/Makefile.am
+++ b/debian.upstream/Makefile.am
@@ -20,7 +20,7 @@ dist_noinst_DATA = $(DEBIANGENFILES)
MAINTAINERCLEANFILES = Makefile.in $(DEBIANGENFILES)
$(DEBIANGENFILES): %: %.in Makefile
- -sed \
+ -$(AM_V_GEN)sed \
-e 's|\@DATE\@|'"`LC_ALL=C date +'%a, %d %b %Y %X %z'`"'|' \
-e 's|\@LIBDRM_VERSION\@|$(LIBDRM_VERSION)|' \
-e 's|\@LIBVA_PACKAGE_VERSION\@|$(LIBVA_PACKAGE_VERSION)|' \
diff --git a/src/shaders/h264/mc/Makefile.am b/src/shaders/h264/mc/Makefile.am
index dd37a92..ee5f171 100644
--- a/src/shaders/h264/mc/Makefile.am
+++ b/src/shaders/h264/mc/Makefile.am
@@ -178,13 +178,13 @@ all-local: $(TARGETS)
SUFFIXES = .g4a .g4b .gen5.asm
.g4a.g4b:
- m4 $*.g4a > $*.g4m && \
- $(GEN4ASM) -o $@ $*.g4m && \
- $(GEN4ASM) -g 5 -o $@.gen5 $*.g4m && \
+ $(AM_V_GEN)m4 $*.g4a > $*.g4m && \
+ $(AM_V_GEN)$(GEN4ASM) -o $@ $*.g4m && \
+ $(AM_V_GEN)$(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.$@ && \
+ $(AM_V_GEN)cpp -DDEV_ILK -DBOOTSTRAP -I ../ildb/ AllAVC.asm > _mc0.$@ && \
../../gpp.py _mc0.$@ $@ && \
$(GEN4ASM) -l list -a -e tmp.$(INTEL_MC_EXPORT_GEN5) -g 5 $@ \
-o /dev/null && \
@@ -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)
- $(GEN4ASM) -l list -a -e tmp.$(INTEL_MC_EXPORT_GEN5) -g 5 $< \
+ $(AM_V_GEN)$(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 81c4050..aa48607 100644
--- a/src/shaders/mpeg2/vld/Makefile.am
+++ b/src/shaders/mpeg2/vld/Makefile.am
@@ -101,11 +101,11 @@ SUFFIXES = .g4a .g4s .g4b .g4b.gen5
$(INTEL_G4S): $(INTEL_G4A) $(INTEL_G4I)
.g4a.g4s:
- m4 $< > $@
+ $(AM_V_GEN)m4 $< > $@
.g4s.g4b:
- $(GEN4ASM) -o $@ $<
+ $(AM_V_GEN)$(GEN4ASM) -o $@ $<
.g4s.g4b.gen5:
- $(GEN4ASM) -g 5 -o $@ $<
+ $(AM_V_GEN)$(GEN4ASM) -g 5 -o $@ $<
CLEANFILES = $(INTEL_G4S)
diff --git a/src/shaders/post_processing/Makefile.am b/src/shaders/post_processing/Makefile.am
index 75a01f6..6222c21 100644
--- a/src/shaders/post_processing/Makefile.am
+++ b/src/shaders/post_processing/Makefile.am
@@ -143,33 +143,33 @@ all-local: $(TARGETS)
SUFFIXES = .g4a .g4b .g6a .g6b .g5s .g6s .asm
.g4a.g4b:
- m4 $*.g4a > $*.g4m && \
- $(GEN4ASM) -o $@ $*.g4m && \
- $(GEN4ASM) -g 5 -o $@.gen5 $*.g4m && \
+ $(AM_V_GEN)m4 $*.g4a > $*.g4m && \
+ $(AM_V_GEN)$(GEN4ASM) -o $@ $*.g4m && \
+ $(AM_V_GEN)$(GEN4ASM) -g 5 -o $@.gen5 $*.g4m && \
rm $*.g4m
.g6a.g6b:
- m4 $< > $*.g6m && \
- $(GEN4ASM) -g 6 -o $@ $*.g6m && \
+ $(AM_V_GEN)m4 $< > $*.g6m && \
+ $(AM_V_GEN)$(GEN4ASM) -g 6 -o $@ $*.g6m && \
rm $*.g6m
$(INTEL_G4B): $(INTEL_G4I)
$(INTEL_PP_GEN5_ASM): $(INTEL_PP_ASM)
.asm.g5s:
- cpp -D DEV_ILK -I Common/ -I Core_Kernels $< > _pp0.$@; \
+ $(AM_V_GEN)cpp -D DEV_ILK -I Common/ -I Core_Kernels $< > _pp0.$@; \
../gpp.py _pp0.$@ $@; \
rm _pp0.$@
.g5s.g4b.gen5:
- $(GEN4ASM) -a -o $@ -g 5 $<
+ $(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 5 $<
$(INTEL_PP_GEN6_ASM): $(INTEL_PP_ASM)
.asm.g6s:
- cpp -D GT -I Common/ -I Core_Kernels $< > _pp0.$@; \
+ $(AM_V_GEN)cpp -D GT -I Common/ -I Core_Kernels $< > _pp0.$@; \
../gpp.py _pp0.$@ $@; \
rm _pp0.$@
.g6s.g6b:
- $(GEN4ASM) -a -o $@ -g 6 $<
+ $(AM_V_GEN)$(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 b3a56ea..94cb566 100644
--- a/src/shaders/render/Makefile.am
+++ b/src/shaders/render/Makefile.am
@@ -78,23 +78,23 @@ SUFFIXES = .g4a .g4s .g4b .g6a .g6s .g6b .g7a .g7s .g7b
$(INTEL_G4S): $(INTEL_G4A) $(INTEL_G4I)
.g4a.g4s:
- m4 $< > $@
+ $(AM_V_GEN)m4 $< > $@
.g4s.g4b:
- $(GEN4ASM) -o $@ $<
+ $(AM_V_GEN)$(GEN4ASM) -o $@ $<
.g4s.g4b.gen5:
- $(GEN4ASM) -g 5 -o $@ $<
+ $(AM_V_GEN)$(GEN4ASM) -g 5 -o $@ $<
$(INTEL_G6S): $(INTEL_G6A) $(INTEL_G6I)
.g6a.g6s:
- m4 $< > $@
+ $(AM_V_GEN)m4 $< > $@
.g6s.g6b:
- $(GEN4ASM) -g 6 -o $@ $<
+ $(AM_V_GEN)$(GEN4ASM) -g 6 -o $@ $<
$(INTEL_G7S): $(INTEL_G7A) $(INTEL_G7I)
.g7a.g7s:
- m4 $< > $@
+ $(AM_V_GEN)m4 $< > $@
.g7s.g7b:
- $(GEN4ASM) -g 7 -o $@ $<
+ $(AM_V_GEN)$(GEN4ASM) -g 7 -o $@ $<
CLEANFILES = \
$(INTEL_G4S) \
diff --git a/src/shaders/vme/Makefile.am b/src/shaders/vme/Makefile.am
index 3acfd04..a1a3368 100644
--- a/src/shaders/vme/Makefile.am
+++ b/src/shaders/vme/Makefile.am
@@ -22,15 +22,15 @@ SUFFIXES = .g6a .g6b .g7a .g7b .gen6.asm .gen7.asm
$(INTEL_GEN6_ASM): $(VME_CORE) $(INTEL_GEN6_INC)
.g6a.gen6.asm:
- m4 $< > $@
+ $(AM_V_GEN)m4 $< > $@
.gen6.asm.g6b:
- $(GEN4ASM) -g 6 -o $@ $<
+ $(AM_V_GEN)$(GEN4ASM) -g 6 -o $@ $<
$(INTEL_GEN7_ASM): $(VME_CORE) $(INTEL_GEN7_INC)
.g7a.gen7.asm:
- m4 $< > $@
+ $(AM_V_GEN)m4 $< > $@
.gen7.asm.g7b:
- $(GEN4ASM) -g 7 -o $@ $<
+ $(AM_V_GEN)$(GEN4ASM) -g 7 -o $@ $<
CLEANFILES = $(INTEL_GEN6_ASM) $(INTEL_GEN7_ASM)