Fwd: Re: [RFC i-g-t 4/7] tools/Makefile: Don't build tools that depend on libdrm_intel.

Fwd: Re: [RFC i-g-t 4/7] tools/Makefile: Don't build tools that depend on libdrm_intel.

[Robert Foss]

> From: Robert Foss <robert.foss@collabora.com>
>
> Use the HAS_INTEL automake flag to avoid building tools that won't

> compile unless libdrm_intel is available in the build system.
>
> Signed-off-by: Robert Foss <robert.foss@collabora.com>
> ---
>  tools/Android.mk       |  8 ++++++++
>  tools/Makefile.am      |  8 ++++++++
>  tools/Makefile.sources | 16 ++++++----------
>  3 files changed, 22 insertions(+), 10 deletions(-)
>
> diff --git a/tools/Android.mk b/tools/Android.mk
> index 5f64184..7c99432 100644
> --- a/tools/Android.mk
> +++ b/tools/Android.mk
> @@ -67,6 +67,14 @@ ifneq ("${ANDROID_HAS_CAIRO}", "1")
>      skip_tools_list += intel_residency
>  endif
>
> +ifeq ($(HAVE_LIBDRM_INTEL),true)
> +    bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
> +
> +    intel_dump_decode_SOURCES =	intel_dump_decode.c
> +    intel_error_decode_SOURCES = intel_error_decode.c
Drop these two lines all together. The default extension for autoconf is 
.c, thus just mentionoing the program name will automatically pick the 
above sources respectively. On the Android build the function add_tool 
(a few lines above) already does it for us.

> +    intel_error_decode_LDFLAGS = -lz
Seems like I was wrong about this one... Android does use it (despite 
that it looks a bit ugly). Thus one can keep it where it was.

-Emil





_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx