[Mesa-dev] [PATCH 0.5/7] intel/tools: Use a makefile included from intel/Makefile.am

[Emil Velikov]

On 2 March 2017 at 06:00, Jason Ekstrand <jason at jlekstrand.net> wrote:
> ---
>  src/Makefile.am                                    |  4 --
>  src/intel/Makefile.am                              |  2 +
>  src/intel/{tools/Makefile.am => Makefile.tools.am} | 52 +++++++---------------
>  3 files changed, 17 insertions(+), 41 deletions(-)
>  rename src/intel/{tools/Makefile.am => Makefile.tools.am} (56%)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 860be53..7001528 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -112,10 +112,6 @@ if HAVE_EGL
>  SUBDIRS += egl
>  endif
>
> -if HAVE_INTEL_DRIVERS
> -SUBDIRS += intel/tools
> -endif
> -
>  if HAVE_VULKAN_COMMON
>  SUBDIRS += vulkan
>  endif
> diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
> index bab7d3c..3abd28d 100644
> --- a/src/intel/Makefile.am
> +++ b/src/intel/Makefile.am
> @@ -48,6 +48,7 @@ MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
>  PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
>
>  noinst_LTLIBRARIES =
> +noinst_PROGRAMS =
>  check_PROGRAMS =
>  TESTS =
>  BUILT_SOURCES =
> @@ -59,5 +60,6 @@ include Makefile.common.am
>  include Makefile.compiler.am
>  include Makefile.genxml.am
>  include Makefile.isl.am
> +include Makefile.tools.am
>
>  CLEANFILES += $(BUILT_SOURCES)
> diff --git a/src/intel/tools/Makefile.am b/src/intel/Makefile.tools.am
> similarity index 56%
> rename from src/intel/tools/Makefile.am
> rename to src/intel/Makefile.tools.am
> index 4d43a7a..add8a2d 100644
> --- a/src/intel/tools/Makefile.am
> +++ b/src/intel/Makefile.tools.am
> @@ -1,4 +1,4 @@
> -# Copyright © 2016 Intel Corporation
> +# Copyright 2015-2017 Intel Corporation
>  #
>  # Permission is hereby granted, free of charge, to any person obtaining a
>  # copy of this software and associated documentation files (the "Software"),
> @@ -19,47 +19,25 @@
>  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
>  # IN THE SOFTWARE.
>
> -# The gallium includes are for the util/u_math.h include from main/macros.h
> -AM_CPPFLAGS = \
> -       $(INTEL_CFLAGS) \
> -       $(VALGRIND_CFLAGS) \
> -       $(DEFINES) \
> -       -I$(top_srcdir)/include \
> -       -I$(top_builddir)/src \
> -       -I$(top_srcdir)/src \
> -       -I$(top_srcdir)/src/mapi \
> -       -I$(top_srcdir)/src/mesa \
> -       -I$(top_srcdir)/src/mesa/drivers/dri/common \
> -       -I$(top_srcdir)/src/mesa/drivers/dri/i965 \
> -       -I$(top_srcdir)/src/gallium/auxiliary \
> -       -I$(top_srcdir)/src/gallium/include \
> -       -I$(top_builddir)/src/intel \
> -       -I$(top_srcdir)/src/intel
> +noinst_PROGRAMS += tools/aubinator
>
> -aubinator_DEPS = \
> -       $(top_builddir)/src/intel/common/libintel_common.la \
> -       $(top_builddir)/src/intel/compiler/libintel_compiler.la \
> +tools_aubinator_SOURCES = \
> +       tools/aubinator.c \
> +       tools/decoder.c \
> +       tools/decoder.h \
> +       tools/disasm.c \
> +       tools/gen_disasm.h
> +
> +tools_aubinator_LDADD = \
> +       common/libintel_common.la \
> +       compiler/libintel_compiler.la \
>         $(top_builddir)/src/util/libmesautil.la \
>         $(PER_GEN_LIBS) \
>         $(PTHREAD_LIBS) \
>         $(DLOPEN_LIBS) \
> +       $(EXPAT_LIBS) \
>         -lm
>
> -noinst_PROGRAMS = aubinator
> -
> -aubinator_SOURCES = \
> -       aubinator.c \
> -       decoder.c \
> -       decoder.h \
> -       disasm.c \
> -       gen_disasm.h
> -
> -aubinator_LDADD = \
> -       $(aubinator_DEPS) \
> -       $(EXPAT_LIBS)
> -
> -aubinator_CFLAGS = \
> +tools_aubinator_CFLAGS = \
>         $(AM_CFLAGS) \
> -       $(EXPAT_CFLAGS) \
> -       -I$(top_srcdir)/include \
> -       -I$(top_srcdir)/src
> +       $(EXPAT_CFLAGS)
Nit: move the CFLAGS between SOURCES and LDADD.

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

-Emil