[Intel-gfx] [PATCH i-g-t v2] lib: use the local intel_aub.h file

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

File is provided by the libdrm_intel package which is optional. Since we
already have a local copy of the file, we might as well use it ;-)

v2: Move the file alongside intel_bufmgr.h and use it in the
disable-intel case.

Cc: Brian Starkey <brian.starkey at arm.com>
Reported-by: Brian Starkey <brian.starkey at arm.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 lib/stubs/drm/README                 | 6 +++---
 {tools => lib/stubs/drm}/intel_aub.h | 0
 tools/Makefile.am                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename {tools => lib/stubs/drm}/intel_aub.h (100%)

diff --git a/lib/stubs/drm/README b/lib/stubs/drm/README
index 79f2b5f..118837c 100644
--- a/lib/stubs/drm/README
+++ b/lib/stubs/drm/README
@@ -1,4 +1,4 @@
-intel_bufmgr.h is a local copy of the file provided by libdrm (intel/intel_bufmgr.h).
+intel_bufmgr.h and intel_aub.h are a local copy of the files provided by libdrm.
 
-Before releasing i-g-t a current copy of intel_bufmgr.h should be copied into
-this directory of i-g-t.
+Before releasing i-g-t a current copy of the files should be copied into this
+directory of i-g-t.
diff --git a/tools/intel_aub.h b/lib/stubs/drm/intel_aub.h
similarity index 100%
rename from tools/intel_aub.h
rename to lib/stubs/drm/intel_aub.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 11ec2db..18f86f6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -22,7 +22,7 @@ AM_LDFLAGS = -Wl,--as-needed
 module_LTLIBRARIES = intel_aubdump.la
 moduledir = $(libdir)
 intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined
-intel_aubdump_la_SOURCES = aubdump.c intel_aub.h
+intel_aubdump_la_SOURCES = aubdump.c
 intel_aubdump_la_LIBADD = $(top_builddir)/lib/libintel_tools.la -ldl
 
 bin_SCRIPTS = intel_aubdump
-- 
2.9.3