On Friday, May 20, 2016 23:59 BST, robert.foss@xxxxxxxxxxxxx wrote: > From: Robert Foss <robert.foss@xxxxxxxxxxxxx> > > 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@xxxxxxxxxxxxx> > --- > benchmarks/Makefile.sources | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/benchmarks/Makefile.sources b/benchmarks/Makefile.sources > index 81607a5..26ee3ea 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 \ > @@ -16,6 +12,15 @@ benchmarks_PROGRAMS = \ > gem_prw \ > gem_set_domain \ > gem_syslatency \ > - gem_userptr_benchmark \ > kms_vblank \ > $(NULL) > + > +if HAVE_INTEL > + benchmarks_PROGRAMS += \ > + intel_upload_blit_large \ > + intel_upload_blit_large_gtt \ > + intel_upload_blit_large_map \ > + intel_upload_blit_small \ > + gem_userptr_benchmark \ > + $(NULL) > +endif Some suggestions: - Please don't use conditionals in the Makefile.sources - you'll break the other build (Android) - instead of ^^ use separate variable and combine them in the Makefile.am/Android.mk - Don't double-indent, don't think any other place does so. Thanks Emil _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
