Skip to contentSkip to conversation

tools: fix distcheck

PATCH New Thomas Wood 1 participant 2 messages Jun 9, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tools: fix distcheck

Fix include paths and references to missing files.

---
 tools/null_state_gen/Makefile.am              | 3 +++
 tools/null_state_gen/intel_renderstate_gen6.c | 4 ++--
 tools/null_state_gen/intel_renderstate_gen7.c | 4 ++--
 tools/null_state_gen/intel_renderstate_gen8.c | 4 ++--
 tools/quick_dump/Makefile.am                  | 5 ++++-
 5 files changed, 13 insertions(+), 7 deletions(-)
tools/null_state_gen/Makefile.am +3 -0
index 62b8ff7..c0103a0 100644
@@ -1,7 +1,10 @@
 noinst_PROGRAMS = intel_null_state_gen
 
+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
+
 intel_null_state_gen_SOURCES = 	\
 	intel_batchbuffer.c \
+	intel_batchbuffer.h \
 	intel_renderstate_gen6.c \
 	intel_renderstate_gen7.c \
 	intel_renderstate_gen8.c \
tools/null_state_gen/intel_renderstate_gen6.c +2 -2
index f169d02..dc255cf 100644
@@ -1,6 +1,6 @@
 #include "intel_batchbuffer.h"
-#include <lib/gen6_render.h>
-#include <lib/intel_reg.h>
+#include "gen6_render.h"
+#include "intel_reg.h"
 #include <string.h>
 
 static const uint32_t ps_kernel_nomask_affine[][4] = {
tools/null_state_gen/intel_renderstate_gen7.c +2 -2
index 8fe8a80..4f955c3 100644
@@ -23,8 +23,8 @@
 
 
 #include "intel_batchbuffer.h"
-#include <lib/gen7_render.h>
-#include <lib/intel_reg.h>
+#include "gen7_render.h"
+#include "intel_reg.h"
 #include <stdio.h>
 
 static const uint32_t ps_kernel[][4] = {
tools/null_state_gen/intel_renderstate_gen8.c +2 -2
index 437454e..b922c73 100644
@@ -1,6 +1,6 @@
 #include "intel_batchbuffer.h"
-#include <lib/gen8_render.h>
-#include <lib/intel_reg.h>
+#include "gen8_render.h"
+#include "intel_reg.h"
 #include <string.h>
 
 struct {
tools/quick_dump/Makefile.am +4 -1
index 468dd45..a7b2a16 100644
@@ -27,7 +27,10 @@ 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_display.txt vlv_dpio.txt valleyview \
+	      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 \
Signature · 1 line
1.9.3
#1 lore raw

PATCH 2/2 quick_dump: read the architecture files for items to add to EXTRA_DIST

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

---
 configure.ac                 | 6 ++++++
 tools/quick_dump/Makefile.am | 9 +--------
 2 files changed, 7 insertions(+), 8 deletions(-)
configure.ac +6 -0
index cb130a9..9c52188 100644
@@ -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
tools/quick_dump/Makefile.am +1 -8
index a7b2a16..2d1685b 100644
@@ -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
Signature · 1 line
1.9.3