diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-10-27 10:38:38 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2016-11-09 15:17:20 +0100 |
| commit | 8db658c0d0eea431ebf267e3ea5218cc1b979a9e (patch) | |
| tree | 9d068a5a98de83cfdfc80a96f06891f0b2c3aa22 | |
| parent | a0b774ff6371b00c4dcd90bd4059ab85a527a2c8 (diff) | |
lib: use the local intel_aub.h file
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@arm.com>
Reported-by: Brian Starkey <brian.starkey@arm.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Tested-by: Brian Starkey <brian.starkey@arm.com>
| -rw-r--r-- | lib/stubs/drm/README | 6 | ||||
| -rw-r--r-- | lib/stubs/drm/intel_aub.h (renamed from tools/intel_aub.h) | 0 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/stubs/drm/README b/lib/stubs/drm/README index 79f2b5f6..118837c3 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 index 5f0aba8e..5f0aba8e 100644 --- a/tools/intel_aub.h +++ b/lib/stubs/drm/intel_aub.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 11ec2db3..18f86f6a 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 |