diff options
| author | Robert Foss <robert.foss@collabora.com> | 2016-07-27 13:17:38 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-04 13:13:05 +0200 |
| commit | f6b9f961aaca1a255e833564a7d50a079d9e51b2 (patch) | |
| tree | 3d6cffd7e768f0205732728eb5fd03e26ee05d5c /benchmarks | |
| parent | 8680b48ac85abacb9114a9cd98c72cb47f750e89 (diff) | |
benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel
Use the HAS_INTEL automake flag to avoid building benchmarks that won't
compile unless libdrm_intel is available in the build system.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/Android.mk | 4 | ||||
| -rw-r--r-- | benchmarks/Makefile.am | 5 | ||||
| -rw-r--r-- | benchmarks/Makefile.sources | 13 |
3 files changed, 16 insertions, 6 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index 207a1774..22ecd2fd 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -34,4 +34,8 @@ endef benchmark_list := $(benchmarks_PROGRAMS) +ifeq ($(HAVE_LIBDRM_INTEL),true) + benchmark_list += $(LIBDRM_INTEL_BENCHMARKS) +endif + $(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item)))) diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 49d2f649..7400dd0f 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -1,6 +1,9 @@ - include Makefile.sources +if HAVE_LIBDRM_INTEL + benchmarks_PROGRAMS += $(LIBDRM_INTEL_BENCHMARKS) +endif + AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) \ $(WERROR_CFLAGS) diff --git a/benchmarks/Makefile.sources b/benchmarks/Makefile.sources index 6865e737..0862b763 100644 --- a/benchmarks/Makefile.sources +++ b/benchmarks/Makefile.sources @@ -1,10 +1,6 @@ benchmarksdir=$(libexecdir)/intel-gpu-tools/benchmarks benchmarks_PROGRAMS = \ - intel_upload_blit_large \ - intel_upload_blit_large_gtt \ - intel_upload_blit_large_map \ - intel_upload_blit_small \ gem_blt \ gem_create \ gem_exec_ctx \ @@ -17,7 +13,14 @@ benchmarks_PROGRAMS = \ gem_prw \ gem_set_domain \ gem_syslatency \ - gem_userptr_benchmark \ kms_vblank \ vgem_mmap \ $(NULL) + +LIBDRM_INTEL_BENCHMARKS = \ + intel_upload_blit_large \ + intel_upload_blit_large_gtt \ + intel_upload_blit_large_map \ + intel_upload_blit_small \ + gem_userptr_benchmark \ + $(NULL) |