diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-02-09 09:44:00 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-02-09 09:46:03 +0100 |
| commit | 9e5478dc4345ec8747c4e109ba4f739a26b9341f (patch) | |
| tree | 2de2efb41ce196139336ede23609135b3b0d8ac3 | |
| parent | 467a9fac9bbb6385c0372a6c6a0f1d2f891984e9 (diff) | |
lib: Only compile igt_vc4 is we have it
Unbreaks compilation fail.
Also appease gcc in gem_exec_basic because.
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/Makefile.sources | 2 | ||||
| -rw-r--r-- | tests/gem_exec_basic.c | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 7232f9663..460e0046e 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 8a8143f23..499986805 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 3f91b78f9..3ee721647 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); |