[Intel-gfx] [i-g-t 2/2] quick_dump: read the architecture files for items to add to EXTRA_DIST

Thomas Wood thomas.wood at intel.com
Mon Jun 9 13:04:20 CEST 2014


Each architecture file contains a list of the text files it requires, so
use this to add to the list of files to distribute.

Signed-off-by: Thomas Wood <thomas.wood at intel.com>
---
 configure.ac                 | 6 ++++++
 tools/quick_dump/Makefile.am | 9 +--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index cb130a9..9c52188 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,6 +203,12 @@ fi
 AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes])
 AC_DEFINE_UNQUOTED(TARGET_CPU_PLATFORM, ["$host_cpu"], [Target platform])
 
+files="broadwell cherryview haswell ivybridge sandybridge valleyview"
+for file in $files; do
+	QUICK_DUMP_EXTRA_DIST+="$file `tr '\n' ' ' < tools/quick_dump/$file`"
+done
+AC_SUBST(QUICK_DUMP_EXTRA_DIST)
+
 AC_CONFIG_FILES([
 		 Makefile
 		 benchmarks/Makefile
diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am
index a7b2a16..2d1685b 100644
--- a/tools/quick_dump/Makefile.am
+++ b/tools/quick_dump/Makefile.am
@@ -23,15 +23,8 @@ all-local: I915ChipsetPython.la
 	$(LN_S) -f .libs/I915ChipsetPython.so _chipset.so
 
 CLEANFILES = chipset_wrap_python.c chipset.py _chipset.so
-EXTRA_DIST =  \
+EXTRA_DIST = $(QUICK_DUMP_EXTRA_DIST) \
 	      base_display.txt base_interrupt.txt base_other.txt base_power.txt base_rings.txt \
-	      gen6_other.txt sandybridge \
-	      gen7_other.txt ivybridge \
-	      vlv_pipe_a.txt vlv_pipe_b.txt \
-	      vlv_display_base.txt vlv_dpio_phy.txt \
-	      vlv_dsi.txt vlv_flisdsi.txt \
-	      valleyview \
-	      gen8_interrupt.txt \
 	      quick_dump.py \
 	      reg_access.py \
 	      chipset.i chipset.py
-- 
1.9.3




More information about the Intel-gfx mailing list