Unbreaks compilation fail. Also appease gcc in gem_exec_basic because. Cc: Eric Anholt <eric@xxxxxxxxxx> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> --- lib/Makefile.am | 6 ++++++ lib/Makefile.sources | 2 -- tests/gem_exec_basic.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 7232f9663038..460e0046e00f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -8,6 +8,12 @@ include Makefile.sources noinst_LTLIBRARIES = libintel_tools.la noinst_HEADERS = check-ndebug.h +if HAVE_VC4 + libintel_tools_la_SOURCES += \ + igt_vc4.c \ + igt_vc4.h +endif + AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(LIBUNWIND_CFLAGS) $(DEBUG_CFLAGS) \ -DIGT_SRCDIR=\""$(abs_top_srcdir)/tests"\" \ diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 8a8143f23bbe..4999868052b1 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -16,8 +16,6 @@ libintel_tools_la_SOURCES = \ igt_gt.h \ igt_stats.c \ igt_stats.h \ - igt_vc4.c \ - igt_vc4.h \ instdone.c \ instdone.h \ intel_batchbuffer.c \ diff --git a/tests/gem_exec_basic.c b/tests/gem_exec_basic.c index 3f91b78f9d46..3ee7216472bb 100644 --- a/tests/gem_exec_basic.c +++ b/tests/gem_exec_basic.c @@ -30,7 +30,6 @@ static void noop(int fd, unsigned ring) uint32_t bbe = MI_BATCH_BUFFER_END; struct drm_i915_gem_execbuffer2 execbuf; struct drm_i915_gem_exec_object2 exec; - int ret; gem_require_ring(fd, ring); -- 2.7.0.rc3 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
