[Intel-gfx] [i-g-t 1/2] tools: fix distcheck

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


Fix include paths and references to missing files.

Signed-off-by: Thomas Wood <thomas.wood at intel.com>
---
 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(-)

diff --git a/tools/null_state_gen/Makefile.am b/tools/null_state_gen/Makefile.am
index 62b8ff7..c0103a0 100644
--- a/tools/null_state_gen/Makefile.am
+++ b/tools/null_state_gen/Makefile.am
@@ -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 \
diff --git a/tools/null_state_gen/intel_renderstate_gen6.c b/tools/null_state_gen/intel_renderstate_gen6.c
index f169d02..dc255cf 100644
--- a/tools/null_state_gen/intel_renderstate_gen6.c
+++ b/tools/null_state_gen/intel_renderstate_gen6.c
@@ -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] = {
diff --git a/tools/null_state_gen/intel_renderstate_gen7.c b/tools/null_state_gen/intel_renderstate_gen7.c
index 8fe8a80..4f955c3 100644
--- a/tools/null_state_gen/intel_renderstate_gen7.c
+++ b/tools/null_state_gen/intel_renderstate_gen7.c
@@ -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] = {
diff --git a/tools/null_state_gen/intel_renderstate_gen8.c b/tools/null_state_gen/intel_renderstate_gen8.c
index 437454e..b922c73 100644
--- a/tools/null_state_gen/intel_renderstate_gen8.c
+++ b/tools/null_state_gen/intel_renderstate_gen8.c
@@ -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 {
diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am
index 468dd45..a7b2a16 100644
--- a/tools/quick_dump/Makefile.am
+++ b/tools/quick_dump/Makefile.am
@@ -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 \
-- 
1.9.3




More information about the Intel-gfx mailing list