[Mesa-dev] [PATCH] autotools: include meson build files in tarball
Dylan Baker
dylan at pnwbakers.com
Thu Jan 18 21:27:35 UTC 2018
Quoting Eric Engestrom (2018-01-18 13:04:00)
> On Thursday, 2018-01-18 17:09:04 +0000, Dylan Baker wrote:
> > This adds the meson.build, meson_options.txt, and a few scripts that are
> > used exclusively by the meson build.
> >
> > Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
>
> I could've sworn we already some $(shell find -name meson.build) thing
> for this?
>
> One note below (in src/gallium/drivers/swr/Makefile.am), but with that
> fixed:
> Acked-by: Eric Engestrom <eric at engestrom.ch>
>
> > ---
> > Makefile.am | 7 ++++++-
> > src/Makefile.am | 2 +-
> > src/amd/Makefile.am | 9 ++++++++-
> > src/amd/vulkan/Makefile.am | 3 ++-
> > src/broadcom/Makefile.am | 7 ++++++-
> > src/compiler/Makefile.am | 9 ++++++++-
> > src/egl/Makefile.am | 3 ++-
> > src/egl/wayland/wayland-drm/Makefile.am | 2 +-
> > src/egl/wayland/wayland-egl/Makefile.am | 2 +-
> > src/gallium/Makefile.am | 3 ++-
> > src/gallium/auxiliary/Makefile.am | 3 ++-
> > src/gallium/auxiliary/pipe-loader/Makefile.am | 2 +-
> > src/gallium/drivers/ddebug/Makefile.am | 2 ++
> > src/gallium/drivers/etnaviv/Makefile.am | 2 ++
> > src/gallium/drivers/freedreno/Makefile.am | 2 ++
> > src/gallium/drivers/i915/Makefile.am | 2 +-
> > src/gallium/drivers/llvmpipe/Makefile.am | 2 +-
> > src/gallium/drivers/noop/Makefile.am | 2 +-
> > src/gallium/drivers/nouveau/Makefile.am | 2 +-
> > src/gallium/drivers/r300/Makefile.am | 3 ++-
> > src/gallium/drivers/r600/Makefile.am | 3 ++-
> > src/gallium/drivers/radeon/Makefile.am | 2 ++
> > src/gallium/drivers/radeonsi/Makefile.am | 1 +
> > src/gallium/drivers/rbug/Makefile.am | 2 +-
> > src/gallium/drivers/softpipe/Makefile.am | 2 +-
> > src/gallium/drivers/svga/Makefile.am | 3 ++-
> > src/gallium/drivers/swr/Makefile.am | 9 ++-------
> > src/gallium/drivers/trace/Makefile.am | 3 ++-
> > src/gallium/drivers/vc4/Makefile.am | 2 +-
> > src/gallium/drivers/vc5/Makefile.am | 2 ++
> > src/gallium/drivers/virgl/Makefile.am | 2 ++
> > src/gallium/state_trackers/clover/Makefile.am | 2 +-
> > src/gallium/state_trackers/dri/Makefile.am | 2 +-
> > src/gallium/state_trackers/glx/xlib/Makefile.am | 2 +-
> > src/gallium/state_trackers/nine/Makefile.am | 2 +-
> > src/gallium/state_trackers/omx_bellagio/Makefile.am | 2 ++
> > src/gallium/state_trackers/osmesa/Makefile.am | 2 +-
> > src/gallium/state_trackers/va/Makefile.am | 2 ++
> > src/gallium/state_trackers/vdpau/Makefile.am | 2 ++
> > src/gallium/state_trackers/xa/Makefile.am | 2 +-
> > src/gallium/state_trackers/xvmc/Makefile.am | 2 ++
> > src/gallium/targets/d3dadapter9/Makefile.am | 2 +-
> > src/gallium/targets/dri/Makefile.am | 1 +
> > src/gallium/targets/libgl-xlib/Makefile.am | 2 +-
> > src/gallium/targets/omx-bellagio/Makefile.am | 2 +-
> > src/gallium/targets/opencl/Makefile.am | 2 +-
> > src/gallium/targets/osmesa/Makefile.am | 3 ++-
> > src/gallium/targets/pipe-loader/Makefile.am | 2 +-
> > src/gallium/targets/va/Makefile.am | 2 +-
> > src/gallium/targets/vdpau/Makefile.am | 3 ++-
> > src/gallium/targets/xa/Makefile.am | 2 +-
> > src/gallium/targets/xvmc/Makefile.am | 2 +-
> > src/gallium/winsys/amdgpu/drm/Makefile.am | 2 ++
> > src/gallium/winsys/etnaviv/drm/Makefile.am | 2 ++
> > src/gallium/winsys/freedreno/drm/Makefile.am | 2 ++
> > src/gallium/winsys/i915/drm/Makefile.am | 2 ++
> > src/gallium/winsys/imx/drm/Makefile.am | 2 ++
> > src/gallium/winsys/nouveau/drm/Makefile.am | 2 ++
> > src/gallium/winsys/pl111/drm/Makefile.am | 2 ++
> > src/gallium/winsys/radeon/drm/Makefile.am | 2 ++
> > src/gallium/winsys/svga/drm/Makefile.am | 2 +-
> > src/gallium/winsys/sw/dri/Makefile.am | 2 +-
> > src/gallium/winsys/sw/kms-dri/Makefile.am | 2 ++
> > src/gallium/winsys/sw/null/Makefile.am | 2 +-
> > src/gallium/winsys/sw/wrapper/Makefile.am | 2 +-
> > src/gallium/winsys/sw/xlib/Makefile.am | 2 +-
> > src/gallium/winsys/vc4/drm/Makefile.am | 2 ++
> > src/gallium/winsys/vc5/drm/Makefile.am | 2 ++
> > src/gallium/winsys/virgl/drm/Makefile.am | 2 ++
> > src/gallium/winsys/virgl/vtest/Makefile.am | 2 ++
> > src/gbm/Makefile.am | 2 +-
> > src/glx/Makefile.am | 2 +-
> > src/glx/tests/Makefile.am | 2 +-
> > src/glx/windows/Makefile.am | 2 ++
> > src/gtest/Makefile.am | 3 ++-
> > src/intel/Makefile.am | 10 +++++++++-
> > src/loader/Makefile.am | 2 +-
> > src/mapi/Makefile.am | 7 ++++++-
> > src/mapi/glapi/gen/Makefile.am | 3 ++-
> > src/mesa/Makefile.am | 3 +++
> > src/mesa/drivers/dri/Makefile.am | 2 ++
> > src/mesa/drivers/dri/common/Makefile.am | 2 +-
> > src/mesa/drivers/dri/i915/Makefile.am | 2 ++
> > src/mesa/drivers/dri/i965/Makefile.am | 3 ++-
> > src/mesa/drivers/dri/nouveau/Makefile.am | 3 ++-
> > src/mesa/drivers/dri/r200/Makefile.am | 3 ++-
> > src/mesa/drivers/dri/radeon/Makefile.am | 3 ++-
> > src/mesa/drivers/dri/swrast/Makefile.am | 2 ++
> > src/mesa/drivers/osmesa/Makefile.am | 2 +-
> > src/mesa/drivers/x11/Makefile.am | 2 +-
> > src/mesa/main/tests/Makefile.am | 2 ++
> > src/util/Makefile.am | 3 ++-
> > src/util/tests/hash_table/Makefile.am | 2 ++
> > src/util/tests/string_buffer/Makefile.am | 2 ++
> > src/util/xmlpool/Makefile.am | 3 ++-
> > src/vulkan/Makefile.am | 5 ++++-
> > 96 files changed, 187 insertions(+), 69 deletions(-)
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index 929fbceed30..5c3a6717d34 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -59,7 +59,12 @@ EXTRA_DIST = \
> > scons \
> > SConstruct \
> > build-support/conftest.dyn \
> > - build-support/conftest.map
> > + build-support/conftest.map \
> > + meson.build \
> > + meson_options.txt \
> > + bin/meson.build \
> > + include/meson.build \
> > + bin/install_megadrivers.py
> >
> > noinst_HEADERS = \
> > include/c99_alloca.h \
> > diff --git a/src/Makefile.am b/src/Makefile.am
> > index ea530eca7d6..014ffaf3e29 100644
> > --- a/src/Makefile.am
> > +++ b/src/Makefile.am
> > @@ -26,7 +26,7 @@ git_sha1.h: $(top_srcdir)/src/git_sha1.h.in
> >
> > BUILT_SOURCES = git_sha1.h
> > CLEANFILES = $(BUILT_SOURCES)
> > -EXTRA_DIST = git_sha1.h.in
> > +EXTRA_DIST = git_sha1.h.in meson.build
> >
> > SUBDIRS = . gtest util mapi/glapi/gen mapi
> >
> > diff --git a/src/amd/Makefile.am b/src/amd/Makefile.am
> > index 7d191af4431..39cf0741ad9 100644
> > --- a/src/amd/Makefile.am
> > +++ b/src/amd/Makefile.am
> > @@ -23,6 +23,13 @@ include Makefile.sources
> >
> > noinst_LTLIBRARIES =
> >
> > -EXTRA_DIST = $(COMMON_HEADER_FILES) common/sid_tables.py
> > include Makefile.addrlib.am
> > include Makefile.common.am
> > +
> > +EXTRA_DIST = \
> > + $(COMMON_HEADER_FILES) \
> > + common/sid_tables.py \
> > + meson.build \
> > + addrlib/meson.build \
> > + common/meson.build \
> > + vulkan/meson.build
> > diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
> > index 6b352aebf98..4b36b750f83 100644
> > --- a/src/amd/vulkan/Makefile.am
> > +++ b/src/amd/vulkan/Makefile.am
> > @@ -135,7 +135,8 @@ EXTRA_DIST = \
> > radv_extensions.py \
> > vk_format_layout.csv \
> > vk_format_parse.py \
> > - vk_format_table.py
> > + vk_format_table.py \
> > + meson.build
> >
> > libvulkan_radeon_la_LIBADD = $(VULKAN_LIB_DEPS)
> >
> > diff --git a/src/broadcom/Makefile.am b/src/broadcom/Makefile.am
> > index 01b485e7d41..35ed703a095 100644
> > --- a/src/broadcom/Makefile.am
> > +++ b/src/broadcom/Makefile.am
> > @@ -46,7 +46,12 @@ check_PROGRAMS =
> > TESTS =
> > BUILT_SOURCES =
> > CLEANFILES =
> > -EXTRA_DIST = $(BROADCOM_FILES)
> > +EXTRA_DIST = \
> > + $(BROADCOM_FILES) \
> > + meson.build \
> > + cle/meson.build \
> > + compiler/meson.build \
> > + qpu/meson.build
> >
> > MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> > PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> > diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
> > index 45b9cc58543..9093fab6129 100644
> > --- a/src/compiler/Makefile.am
> > +++ b/src/compiler/Makefile.am
> > @@ -57,7 +57,14 @@ check_PROGRAMS =
> > TESTS =
> > BUILT_SOURCES =
> > CLEANFILES =
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = \
> > + SConscript \
> > + glsl/glcpp/meson.build \
> > + glsl/tests/meson.build \
> > + glsl/meson.build \
> > + nir/meson.build \
> > + meson.build
> > +
> >
> > MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> > PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> > diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
> > index 98d0420ec4d..9fcee9d2b84 100644
> > --- a/src/egl/Makefile.am
> > +++ b/src/egl/Makefile.am
> > @@ -219,4 +219,5 @@ EXTRA_DIST = \
> > main/egl.def \
> > main/README.txt \
> > $(GLVND_GEN_DEPS) \
> > - main/50_mesa.json
> > + main/50_mesa.json \
> > + meson.build
> > diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am
> > index 57782da936d..7d1db23f4b9 100644
> > --- a/src/egl/wayland/wayland-drm/Makefile.am
> > +++ b/src/egl/wayland/wayland-drm/Makefile.am
> > @@ -10,7 +10,7 @@ libwayland_drm_la_SOURCES = \
> > wayland-drm-protocol.c
> > noinst_HEADERS = wayland-drm.h
> >
> > -EXTRA_DIST = wayland-drm.xml
> > +EXTRA_DIST = wayland-drm.xml meson.build
> >
> > BUILT_SOURCES = wayland-drm-protocol.c \
> > wayland-drm-client-protocol.h \
> > diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am
> > index 7dde9552f33..31dcca9e10f 100644
> > --- a/src/egl/wayland/wayland-egl/Makefile.am
> > +++ b/src/egl/wayland/wayland-egl/Makefile.am
> > @@ -17,7 +17,7 @@ libwayland_egl_la_LDFLAGS = \
> > TESTS = wayland-egl-symbols-check \
> > wayland-egl-abi-check
> >
> > -EXTRA_DIST = wayland-egl-symbols-check
> > +EXTRA_DIST = wayland-egl-symbols-check meson.build
> >
> > check_PROGRAMS = wayland-egl-abi-check
> >
> > diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
> > index ea20799eba6..af010c89f8d 100644
> > --- a/src/gallium/Makefile.am
> > +++ b/src/gallium/Makefile.am
> > @@ -207,4 +207,5 @@ endif
> >
> > EXTRA_DIST += \
> > tests/graw \
> > - tests/python
> > + tests/python \
> > + meson.build
> > diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
> > index a64ead28e32..95a325f96b3 100644
> > --- a/src/gallium/auxiliary/Makefile.am
> > +++ b/src/gallium/auxiliary/Makefile.am
> > @@ -118,4 +118,5 @@ EXTRA_DIST = \
> > util/u_format.csv \
> > util/u_format_pack.py \
> > util/u_format_parse.py \
> > - util/u_format_table.py
> > + util/u_format_table.py \
> > + meson.build
> > diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am
> > index 878159f2343..718e5afad63 100644
> > --- a/src/gallium/auxiliary/pipe-loader/Makefile.am
> > +++ b/src/gallium/auxiliary/pipe-loader/Makefile.am
> > @@ -48,4 +48,4 @@ libpipe_loader_dynamic_la_LIBADD = \
> > $(top_builddir)/src/loader/libloader.la \
> > $(top_builddir)/src/util/libxmlconfig.la
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/drivers/ddebug/Makefile.am b/src/gallium/drivers/ddebug/Makefile.am
> > index f0e1662d0bd..b36ea239afc 100644
> > --- a/src/gallium/drivers/ddebug/Makefile.am
> > +++ b/src/gallium/drivers/ddebug/Makefile.am
> > @@ -7,3 +7,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libddebug.la
> >
> > libddebug_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/drivers/etnaviv/Makefile.am b/src/gallium/drivers/etnaviv/Makefile.am
> > index 654671133e5..81ef3c9f370 100644
> > --- a/src/gallium/drivers/etnaviv/Makefile.am
> > +++ b/src/gallium/drivers/etnaviv/Makefile.am
> > @@ -42,3 +42,5 @@ etnaviv_compiler_LDADD = \
> > $(top_builddir)/src/util/libmesautil.la \
> > $(GALLIUM_COMMON_LIB_DEPS) \
> > $(ETNAVIV_LIBS)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
> > index 5cb4c74cb68..4e7bf2caeb8 100644
> > --- a/src/gallium/drivers/freedreno/Makefile.am
> > +++ b/src/gallium/drivers/freedreno/Makefile.am
> > @@ -45,3 +45,5 @@ ir3_compiler_LDADD = \
> > $(top_builddir)/src/mesa/libmesagallium.la \
> > $(GALLIUM_COMMON_LIB_DEPS) \
> > $(FREEDRENO_LIBS)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am
> > index eb3c964a37b..6209f66ef10 100644
> > --- a/src/gallium/drivers/i915/Makefile.am
> > +++ b/src/gallium/drivers/i915/Makefile.am
> > @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la
> >
> > libi915_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = TODO
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
> > index 562c2d6321c..d649fa44b95 100644
> > --- a/src/gallium/drivers/llvmpipe/Makefile.am
> > +++ b/src/gallium/drivers/llvmpipe/Makefile.am
> > @@ -77,4 +77,4 @@ lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c
> > lp_test_printf_LDADD = $(TEST_LIBS)
> > nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/drivers/noop/Makefile.am b/src/gallium/drivers/noop/Makefile.am
> > index dc1494b2a6d..1a4354e0b4d 100644
> > --- a/src/gallium/drivers/noop/Makefile.am
> > +++ b/src/gallium/drivers/noop/Makefile.am
> > @@ -13,4 +13,4 @@ noinst_LTLIBRARIES = libnoop.la
> >
> > libnoop_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
> > index c52d62e54a2..91547178e39 100644
> > --- a/src/gallium/drivers/nouveau/Makefile.am
> > +++ b/src/gallium/drivers/nouveau/Makefile.am
> > @@ -50,4 +50,4 @@ nouveau_compiler_LDADD = \
> > $(top_builddir)/src/util/libmesautil.la \
> > $(GALLIUM_COMMON_LIB_DEPS)
> >
> > -EXTRA_DIST = codegen/lib nvc0/mme
> > +EXTRA_DIST = codegen/lib nvc0/mme meson.build
> > diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
> > index 081f332683e..26c75be3271 100644
> > --- a/src/gallium/drivers/r300/Makefile.am
> > +++ b/src/gallium/drivers/r300/Makefile.am
> > @@ -28,4 +28,5 @@ libr300_la_SOURCES = $(C_SOURCES)
> >
> > EXTRA_DIST = \
> > compiler/tests/omod_two_writers.test \
> > - compiler/tests/regalloc_tex_1d_swizzle.test
> > + compiler/tests/regalloc_tex_1d_swizzle.test \
> > + meson.build
> > diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
> > index 6cb9307ade7..bf45fbf7b20 100644
> > --- a/src/gallium/drivers/r600/Makefile.am
> > +++ b/src/gallium/drivers/r600/Makefile.am
> > @@ -42,4 +42,5 @@ CLEANFILES = \
> > EXTRA_DIST = \
> > egd_tables.py \
> > sb/notes.markdown \
> > - sb/sb_bc_fmt_def.inc
> > + sb/sb_bc_fmt_def.inc \
> > + meson.build
> > diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
> > index d5570926885..43dc35c239f 100644
> > --- a/src/gallium/drivers/radeon/Makefile.am
> > +++ b/src/gallium/drivers/radeon/Makefile.am
> > @@ -27,3 +27,5 @@ libradeon_la_LDFLAGS = \
> > $(LLVM_LDFLAGS)
> >
> > endif
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
> > index a3007702014..8c701fa3b8b 100644
> > --- a/src/gallium/drivers/radeonsi/Makefile.am
> > +++ b/src/gallium/drivers/radeonsi/Makefile.am
> > @@ -47,3 +47,4 @@ si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
> >
> > BUILT_SOURCES = $(GENERATED_SOURCES)
> > CLEANFILES = $(GENERATED_SOURCES)
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am
> > index 3e3cb86d619..c784d84232e 100644
> > --- a/src/gallium/drivers/rbug/Makefile.am
> > +++ b/src/gallium/drivers/rbug/Makefile.am
> > @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = librbug.la
> >
> > librbug_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript README
> > +EXTRA_DIST = SConscript README meson.build
> > diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am
> > index fd77edc51a1..c8c2615a970 100644
> > --- a/src/gallium/drivers/softpipe/Makefile.am
> > +++ b/src/gallium/drivers/softpipe/Makefile.am
> > @@ -31,4 +31,4 @@ noinst_LTLIBRARIES = libsoftpipe.la
> >
> > libsoftpipe_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am
> > index 2e5220e9f27..a457df03c8c 100644
> > --- a/src/gallium/drivers/svga/Makefile.am
> > +++ b/src/gallium/drivers/svga/Makefile.am
> > @@ -37,4 +37,5 @@ libsvga_la_SOURCES = $(C_SOURCES)
> >
> > EXTRA_DIST = SConscript \
> > include/README \
> > - svgadump/svga_dump.py
> > + svgadump/svga_dump.py \
> > + meson.build
> > diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
> > index c995f1b84a1..77ac1b8c3d1 100644
> > --- a/src/gallium/drivers/swr/Makefile.am
> > +++ b/src/gallium/drivers/swr/Makefile.am
> > @@ -321,16 +321,11 @@ include $(top_srcdir)/install-gallium-links.mk
> >
> > # Generated gen_builder.hpp is not backwards compatible. So ship only one
> > # created with the oldest supported version of LLVM.
> > -dist-hook:
> > -if SWR_INVALID_LLVM_VERSION
> > - @echo "*******************************************************"
> > - @echo "LLVM 3.9.0 or LLVM 3.9.1 required to create the tarball"
> > - @echo "*******************************************************"
> > - @test
> > -endif
>
> This hunk is unrelated; move it to a separate commit?
> (and the comment just above should go away with the code, right?)
This shouldn't have been committed. I just have to revert this to be able to
test `make dist` since arch has LLVM 5.0. I'll send a v2 without this hunk.
>
> >
> > EXTRA_DIST = \
> > SConscript \
> > + meson.build \
> > + rasterizer/codegen/meson.build \
> > rasterizer/archrast/events.proto \
> > rasterizer/codegen/gen_llvm_ir_macros.py \
> > rasterizer/codegen/gen_llvm_types.py \
> > diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am
> > index 5640192337e..9c834a6d526 100644
> > --- a/src/gallium/drivers/trace/Makefile.am
> > +++ b/src/gallium/drivers/trace/Makefile.am
> > @@ -11,4 +11,5 @@ libtrace_la_SOURCES = $(C_SOURCES)
> >
> > EXTRA_DIST = SConscript \
> > README \
> > - trace.xsl
> > + trace.xsl \
> > + meson.build
> > diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am
> > index c3e49af975d..d65bf20e26d 100644
> > --- a/src/gallium/drivers/vc4/Makefile.am
> > +++ b/src/gallium/drivers/vc4/Makefile.am
> > @@ -54,4 +54,4 @@ endif
> >
> > libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
> >
> > -EXTRA_DIST = kernel/README
> > +EXTRA_DIST = kernel/README meson.build
> > diff --git a/src/gallium/drivers/vc5/Makefile.am b/src/gallium/drivers/vc5/Makefile.am
> > index b8f7e484b34..96cc9504488 100644
> > --- a/src/gallium/drivers/vc5/Makefile.am
> > +++ b/src/gallium/drivers/vc5/Makefile.am
> > @@ -52,3 +52,5 @@ libvc5_la_LIBADD = \
> > libvc5_v33.la \
> > libvc5_v41.la \
> > $()
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/drivers/virgl/Makefile.am b/src/gallium/drivers/virgl/Makefile.am
> > index 82d9756143f..e5e1d9ef6d9 100644
> > --- a/src/gallium/drivers/virgl/Makefile.am
> > +++ b/src/gallium/drivers/virgl/Makefile.am
> > @@ -30,3 +30,5 @@ AM_CPPFLAGS = \
> > noinst_LTLIBRARIES = libvirgl.la
> >
> > libvirgl_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
> > index 7167bc1c5cf..a7befb46059 100644
> > --- a/src/gallium/state_trackers/clover/Makefile.am
> > +++ b/src/gallium/state_trackers/clover/Makefile.am
> > @@ -60,4 +60,4 @@ libclover_la_LIBADD = \
> >
> > libclover_la_SOURCES = $(CPP_SOURCES)
> >
> > -EXTRA_DIST = Doxyfile
> > +EXTRA_DIST = Doxyfile meson.build
> > diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am
> > index 8b427f98aca..d66e585b195 100644
> > --- a/src/gallium/state_trackers/dri/Makefile.am
> > +++ b/src/gallium/state_trackers/dri/Makefile.am
> > @@ -51,4 +51,4 @@ if HAVE_DRI2
> > libdri_la_SOURCES += $(dri2_SOURCES)
> > endif
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.am b/src/gallium/state_trackers/glx/xlib/Makefile.am
> > index 112030be486..914d4a5b885 100644
> > --- a/src/gallium/state_trackers/glx/xlib/Makefile.am
> > +++ b/src/gallium/state_trackers/glx/xlib/Makefile.am
> > @@ -36,4 +36,4 @@ noinst_LTLIBRARIES = libxlib.la
> >
> > libxlib_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/state_trackers/nine/Makefile.am b/src/gallium/state_trackers/nine/Makefile.am
> > index c0c75b34c59..2a66df8b9e6 100644
> > --- a/src/gallium/state_trackers/nine/Makefile.am
> > +++ b/src/gallium/state_trackers/nine/Makefile.am
> > @@ -10,4 +10,4 @@ noinst_LTLIBRARIES = libninetracker.la
> >
> > libninetracker_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = README
> > +EXTRA_DIST = README meson.build
> > diff --git a/src/gallium/state_trackers/omx_bellagio/Makefile.am b/src/gallium/state_trackers/omx_bellagio/Makefile.am
> > index fcd8b2c310e..66f0f1e5e31 100644
> > --- a/src/gallium/state_trackers/omx_bellagio/Makefile.am
> > +++ b/src/gallium/state_trackers/omx_bellagio/Makefile.am
> > @@ -33,3 +33,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libomxtracker.la
> >
> > libomxtracker_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/state_trackers/osmesa/Makefile.am b/src/gallium/state_trackers/osmesa/Makefile.am
> > index 22e65c881e0..e5f2a5e18a1 100644
> > --- a/src/gallium/state_trackers/osmesa/Makefile.am
> > +++ b/src/gallium/state_trackers/osmesa/Makefile.am
> > @@ -40,4 +40,4 @@ noinst_LTLIBRARIES = libosmesa.la
> >
> > libosmesa_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/state_trackers/va/Makefile.am b/src/gallium/state_trackers/va/Makefile.am
> > index 917839167bf..cd548e70b35 100644
> > --- a/src/gallium/state_trackers/va/Makefile.am
> > +++ b/src/gallium/state_trackers/va/Makefile.am
> > @@ -34,3 +34,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libvatracker.la
> >
> > libvatracker_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/state_trackers/vdpau/Makefile.am b/src/gallium/state_trackers/vdpau/Makefile.am
> > index e91b055177f..8bf8945b238 100644
> > --- a/src/gallium/state_trackers/vdpau/Makefile.am
> > +++ b/src/gallium/state_trackers/vdpau/Makefile.am
> > @@ -40,3 +40,5 @@ AM_CPPFLAGS = \
> > noinst_LTLIBRARIES = libvdpautracker.la
> >
> > libvdpautracker_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/state_trackers/xa/Makefile.am b/src/gallium/state_trackers/xa/Makefile.am
> > index 1e51ec9cb89..56ead63d3a4 100644
> > --- a/src/gallium/state_trackers/xa/Makefile.am
> > +++ b/src/gallium/state_trackers/xa/Makefile.am
> > @@ -38,4 +38,4 @@ noinst_LTLIBRARIES = libxatracker.la
> >
> > libxatracker_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = README xa-indent.sh
> > +EXTRA_DIST = README xa-indent.sh meson.build
> > diff --git a/src/gallium/state_trackers/xvmc/Makefile.am b/src/gallium/state_trackers/xvmc/Makefile.am
> > index 398eaf6b698..85d0b5f4953 100644
> > --- a/src/gallium/state_trackers/xvmc/Makefile.am
> > +++ b/src/gallium/state_trackers/xvmc/Makefile.am
> > @@ -59,3 +59,5 @@ tests_test_rendering_SOURCES = tests/test_rendering.c tests/testlib.c
> > tests_test_rendering_LDADD = $(TEST_LIBS)
> > tests_xvmc_bench_SOURCES = tests/xvmc_bench.c tests/testlib.c
> > tests_xvmc_bench_LDADD = $(TEST_LIBS)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am
> > index 159c8ea3527..c2aae0c7808 100644
> > --- a/src/gallium/targets/d3dadapter9/Makefile.am
> > +++ b/src/gallium/targets/d3dadapter9/Makefile.am
> > @@ -77,7 +77,7 @@ d3dadapter9_la_LIBADD = \
> > $(GALLIUM_COMMON_LIB_DEPS)
> >
> > EXTRA_d3dadapter9_la_DEPENDENCIES = d3dadapter9.sym
> > -EXTRA_DIST = d3dadapter9.sym
> > +EXTRA_DIST = d3dadapter9.sym meson.build
> >
> > TARGET_DRIVERS =
> > TARGET_CPPFLAGS =
> > diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
> > index c54f7a69d0d..1d05d91a610 100644
> > --- a/src/gallium/targets/dri/Makefile.am
> > +++ b/src/gallium/targets/dri/Makefile.am
> > @@ -62,6 +62,7 @@ EXTRA_gallium_dri_la_DEPENDENCIES = \
> > $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
> > EXTRA_DIST = \
> > SConscript \
> > + meson.build \
> > dri.sym \
> > $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
> >
> > diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
> > index 263b0846a42..1c622946a90 100644
> > --- a/src/gallium/targets/libgl-xlib/Makefile.am
> > +++ b/src/gallium/targets/libgl-xlib/Makefile.am
> > @@ -83,6 +83,6 @@ AM_CPPFLAGS += -DGALLIUM_SWR
> > endif
> >
> > EXTRA_lib at GL_LIB@_la_DEPENDENCIES = libgl-xlib.sym
> > -EXTRA_DIST = SConscript libgl-xlib.sym
> > +EXTRA_DIST = SConscript libgl-xlib.sym meson.build
> >
> > include $(top_srcdir)/install-gallium-links.mk
> > diff --git a/src/gallium/targets/omx-bellagio/Makefile.am b/src/gallium/targets/omx-bellagio/Makefile.am
> > index 4c9a12c3c74..471ed85cd2c 100644
> > --- a/src/gallium/targets/omx-bellagio/Makefile.am
> > +++ b/src/gallium/targets/omx-bellagio/Makefile.am
> > @@ -39,7 +39,7 @@ libomx_mesa_la_LIBADD += \
> > endif
> >
> > EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym
> > -EXTRA_DIST = omx.sym
> > +EXTRA_DIST = omx.sym meson.build
> >
> > if HAVE_GALLIUM_STATIC_TARGETS
> >
> > diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
> > index 7f55b1a13ea..de68a93ad53 100644
> > --- a/src/gallium/targets/opencl/Makefile.am
> > +++ b/src/gallium/targets/opencl/Makefile.am
> > @@ -42,7 +42,7 @@ nodist_EXTRA_lib at OPENCL_LIBNAME@_la_SOURCES = dummy.cpp
> > lib at OPENCL_LIBNAME@_la_SOURCES =
> >
> > EXTRA_lib at OPENCL_LIBNAME@_la_DEPENDENCIES = opencl.sym
> > -EXTRA_DIST = mesa.icd opencl.sym
> > +EXTRA_DIST = mesa.icd opencl.sym meson.build
> >
> > if HAVE_CLOVER_ICD
> > icddir = $(sysconfdir)/OpenCL/vendors/
> > diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
> > index 2b4af57d5be..f8bee5ef673 100644
> > --- a/src/gallium/targets/osmesa/Makefile.am
> > +++ b/src/gallium/targets/osmesa/Makefile.am
> > @@ -86,7 +86,8 @@ EXTRA_DIST = \
> > osmesa.sym \
> > osmesa.def \
> > osmesa.mingw.def \
> > - SConscript
> > + SConscript \
> > + meson.build
> >
> > include $(top_srcdir)/install-gallium-links.mk
> >
> > diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
> > index 207aed0a253..4b84886f300 100644
> > --- a/src/gallium/targets/pipe-loader/Makefile.am
> > +++ b/src/gallium/targets/pipe-loader/Makefile.am
> > @@ -213,4 +213,4 @@ pipe_swrast_la_LIBADD += \
> >
> > endif
> >
> > -EXTRA_DIST = pipe.sym
> > +EXTRA_DIST = pipe.sym meson.build
> > diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am
> > index 453a1c32541..0f2fe14594b 100644
> > --- a/src/gallium/targets/va/Makefile.am
> > +++ b/src/gallium/targets/va/Makefile.am
> > @@ -39,7 +39,7 @@ gallium_drv_video_la_LIBADD += \
> > endif
> >
> > EXTRA_gallium_drv_video_la_DEPENDENCIES = va.sym
> > -EXTRA_DIST = va.sym
> > +EXTRA_DIST = va.sym meson.build
> >
> > if HAVE_GALLIUM_STATIC_TARGETS
> >
> > diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
> > index c1cd59621e1..2742c7acd44 100644
> > --- a/src/gallium/targets/vdpau/Makefile.am
> > +++ b/src/gallium/targets/vdpau/Makefile.am
> > @@ -44,7 +44,8 @@ EXTRA_libvdpau_gallium_la_DEPENDENCIES = \
> > $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
> > EXTRA_DIST = \
> > vdpau.sym \
> > - $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
> > + $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn \
> > + meson.build
> >
> > TARGET_DRIVERS =
> > TARGET_CPPFLAGS =
> > diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
> > index cd9ca49f568..7b0e9006e06 100644
> > --- a/src/gallium/targets/xa/Makefile.am
> > +++ b/src/gallium/targets/xa/Makefile.am
> > @@ -54,7 +54,7 @@ libxatracker_la_LDFLAGS += \
> > endif
> >
> > EXTRA_libxatracker_la_DEPENDENCIES = xa.sym
> > -EXTRA_DIST = xa.sym
> > +EXTRA_DIST = xa.sym meson.build
> >
> > if HAVE_GALLIUM_STATIC_TARGETS
> >
> > diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
> > index 9f82d2605ed..45b1d860692 100644
> > --- a/src/gallium/targets/xvmc/Makefile.am
> > +++ b/src/gallium/targets/xvmc/Makefile.am
> > @@ -35,7 +35,7 @@ libXvMCgallium_la_LIBADD = \
> > $(GALLIUM_COMMON_LIB_DEPS)
> >
> > EXTRA_libXvMCgallium_la_DEPENDENCIES = xvmc.sym
> > -EXTRA_DIST = xvmc.sym
> > +EXTRA_DIST = xvmc.sym meson.build
> >
> > TARGET_DRIVERS =
> > TARGET_CPPFLAGS =
> > diff --git a/src/gallium/winsys/amdgpu/drm/Makefile.am b/src/gallium/winsys/amdgpu/drm/Makefile.am
> > index 0889591f297..e35fa2cd0a2 100644
> > --- a/src/gallium/winsys/amdgpu/drm/Makefile.am
> > +++ b/src/gallium/winsys/amdgpu/drm/Makefile.am
> > @@ -14,3 +14,5 @@ libamdgpuwinsys_la_LIBADD = \
> > $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
> >
> > libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/etnaviv/drm/Makefile.am b/src/gallium/winsys/etnaviv/drm/Makefile.am
> > index ed04d9516cd..3cc54c8ad13 100644
> > --- a/src/gallium/winsys/etnaviv/drm/Makefile.am
> > +++ b/src/gallium/winsys/etnaviv/drm/Makefile.am
> > @@ -31,3 +31,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libetnavivdrm.la
> >
> > libetnavivdrm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/freedreno/drm/Makefile.am b/src/gallium/winsys/freedreno/drm/Makefile.am
> > index cf4c24cb81c..e7e9a625c3a 100644
> > --- a/src/gallium/winsys/freedreno/drm/Makefile.am
> > +++ b/src/gallium/winsys/freedreno/drm/Makefile.am
> > @@ -31,3 +31,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libfreedrenodrm.la
> >
> > libfreedrenodrm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am
> > index f7f11806492..0b06f9df876 100644
> > --- a/src/gallium/winsys/i915/drm/Makefile.am
> > +++ b/src/gallium/winsys/i915/drm/Makefile.am
> > @@ -31,3 +31,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libi915drm.la
> >
> > libi915drm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/imx/drm/Makefile.am b/src/gallium/winsys/imx/drm/Makefile.am
> > index ad3d0b79a90..f15b531f81f 100644
> > --- a/src/gallium/winsys/imx/drm/Makefile.am
> > +++ b/src/gallium/winsys/imx/drm/Makefile.am
> > @@ -31,3 +31,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libimxdrm.la
> >
> > libimxdrm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am
> > index 9c94ea48191..992fa25cc11 100644
> > --- a/src/gallium/winsys/nouveau/drm/Makefile.am
> > +++ b/src/gallium/winsys/nouveau/drm/Makefile.am
> > @@ -31,3 +31,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libnouveaudrm.la
> >
> > libnouveaudrm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/pl111/drm/Makefile.am b/src/gallium/winsys/pl111/drm/Makefile.am
> > index 34027dcbaad..148e912ef99 100644
> > --- a/src/gallium/winsys/pl111/drm/Makefile.am
> > +++ b/src/gallium/winsys/pl111/drm/Makefile.am
> > @@ -32,3 +32,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libpl111drm.la
> >
> > libpl111drm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am
> > index b413b0b93a0..c94c9b3a9c4 100644
> > --- a/src/gallium/winsys/radeon/drm/Makefile.am
> > +++ b/src/gallium/winsys/radeon/drm/Makefile.am
> > @@ -8,3 +8,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libradeonwinsys.la
> >
> > libradeonwinsys_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am
> > index ac9de18d3df..46bf5d85f9d 100644
> > --- a/src/gallium/winsys/svga/drm/Makefile.am
> > +++ b/src/gallium/winsys/svga/drm/Makefile.am
> > @@ -33,4 +33,4 @@ noinst_LTLIBRARIES = libsvgadrm.la
> >
> > libsvgadrm_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/winsys/sw/dri/Makefile.am b/src/gallium/winsys/sw/dri/Makefile.am
> > index a7d325383c9..ecf63d17da9 100644
> > --- a/src/gallium/winsys/sw/dri/Makefile.am
> > +++ b/src/gallium/winsys/sw/dri/Makefile.am
> > @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libswdri.la
> >
> > libswdri_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/winsys/sw/kms-dri/Makefile.am b/src/gallium/winsys/sw/kms-dri/Makefile.am
> > index 8162553289d..022f3c508da 100644
> > --- a/src/gallium/winsys/sw/kms-dri/Makefile.am
> > +++ b/src/gallium/winsys/sw/kms-dri/Makefile.am
> > @@ -31,3 +31,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libswkmsdri.la
> >
> > libswkmsdri_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/sw/null/Makefile.am b/src/gallium/winsys/sw/null/Makefile.am
> > index 3da568442f8..c2051891931 100644
> > --- a/src/gallium/winsys/sw/null/Makefile.am
> > +++ b/src/gallium/winsys/sw/null/Makefile.am
> > @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libws_null.la
> >
> > libws_null_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/winsys/sw/wrapper/Makefile.am b/src/gallium/winsys/sw/wrapper/Makefile.am
> > index 7a9f1ce6e9b..7cd03a4c2b9 100644
> > --- a/src/gallium/winsys/sw/wrapper/Makefile.am
> > +++ b/src/gallium/winsys/sw/wrapper/Makefile.am
> > @@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libwsw.la
> >
> > libwsw_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am
> > index c7ed33bc46c..e518dda82f4 100644
> > --- a/src/gallium/winsys/sw/xlib/Makefile.am
> > +++ b/src/gallium/winsys/sw/xlib/Makefile.am
> > @@ -31,4 +31,4 @@ noinst_LTLIBRARIES = libws_xlib.la
> >
> > libws_xlib_la_SOURCES = $(C_SOURCES)
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> > diff --git a/src/gallium/winsys/vc4/drm/Makefile.am b/src/gallium/winsys/vc4/drm/Makefile.am
> > index 3bbeb30f1df..a32709bffaf 100644
> > --- a/src/gallium/winsys/vc4/drm/Makefile.am
> > +++ b/src/gallium/winsys/vc4/drm/Makefile.am
> > @@ -29,3 +29,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libvc4drm.la
> >
> > libvc4drm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/vc5/drm/Makefile.am b/src/gallium/winsys/vc5/drm/Makefile.am
> > index fc5d1ca5770..e8584036bf8 100644
> > --- a/src/gallium/winsys/vc5/drm/Makefile.am
> > +++ b/src/gallium/winsys/vc5/drm/Makefile.am
> > @@ -29,3 +29,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libvc5drm.la
> >
> > libvc5drm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/virgl/drm/Makefile.am b/src/gallium/winsys/virgl/drm/Makefile.am
> > index 2473b88ad6e..e543227e39e 100644
> > --- a/src/gallium/winsys/virgl/drm/Makefile.am
> > +++ b/src/gallium/winsys/virgl/drm/Makefile.am
> > @@ -31,3 +31,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libvirgldrm.la
> >
> > libvirgldrm_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gallium/winsys/virgl/vtest/Makefile.am b/src/gallium/winsys/virgl/vtest/Makefile.am
> > index b15a3afd60c..0a31477a1f2 100644
> > --- a/src/gallium/winsys/virgl/vtest/Makefile.am
> > +++ b/src/gallium/winsys/virgl/vtest/Makefile.am
> > @@ -30,3 +30,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libvirglvtest.la
> >
> > libvirglvtest_la_SOURCES = $(C_SOURCES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
> > index 682c4281f4c..5097212cda0 100644
> > --- a/src/gbm/Makefile.am
> > +++ b/src/gbm/Makefile.am
> > @@ -52,6 +52,6 @@ libgbm_la_LIBADD += \
> > endif
> >
> > TESTS = gbm-symbols-check
> > -EXTRA_DIST = gbm-symbols-check
> > +EXTRA_DIST = gbm-symbols-check meson.build
> >
> > include $(top_srcdir)/install-lib-links.mk
> > diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
> > index 5448a090764..5233257fb40 100644
> > --- a/src/glx/Makefile.am
> > +++ b/src/glx/Makefile.am
> > @@ -25,7 +25,7 @@ endif
> >
> > SUBDIRS =
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> >
> > if HAVE_XF86VIDMODE
> > EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
> > diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am
> > index aab93e732a3..07173164f23 100644
> > --- a/src/glx/tests/Makefile.am
> > +++ b/src/glx/tests/Makefile.am
> > @@ -15,7 +15,7 @@ AM_CPPFLAGS = \
> >
> > TESTS = glx-test dispatch-index-check
> > check_PROGRAMS = glx-test
> > -EXTRA_DIST = dispatch-index-check
> > +EXTRA_DIST = dispatch-index-check meson.build
> >
> > glx_test_SOURCES = \
> > clientinfo_unittest.cpp \
> > diff --git a/src/glx/windows/Makefile.am b/src/glx/windows/Makefile.am
> > index f4f8e9664d7..828a930e53f 100644
> > --- a/src/glx/windows/Makefile.am
> > +++ b/src/glx/windows/Makefile.am
> > @@ -32,3 +32,5 @@ libwindowsglx_la_CFLAGS = \
> > $(VISIBILITY_CFLAGS) \
> > $(DEFINES) \
> > $(X11_INCLUDES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
> > index 29d6c6d1998..23b75536109 100644
> > --- a/src/gtest/Makefile.am
> > +++ b/src/gtest/Makefile.am
> > @@ -37,4 +37,5 @@ EXTRA_DIST = \
> > src/gtest-port.cc \
> > src/gtest-printers.cc \
> > src/gtest-test-part.cc \
> > - src/gtest-typed-test.cc
> > + src/gtest-typed-test.cc \
> > + meson.build
> > diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
> > index 6a5e393f175..cde4a70fbc6 100644
> > --- a/src/intel/Makefile.am
> > +++ b/src/intel/Makefile.am
> > @@ -62,7 +62,15 @@ check_PROGRAMS =
> > TESTS =
> > BUILT_SOURCES =
> > CLEANFILES =
> > -EXTRA_DIST =
> > +EXTRA_DIST = \
> > + blorp/meson.build \
> > + common/meson.build \
> > + compiler/meson.build \
> > + genxml/meson.build \
> > + isl/meson.build \
> > + tools/meson.build \
> > + vulkan/meson.build \
> > + meson.build
> >
> > include Makefile.blorp.am
> > include Makefile.common.am
> > diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
> > index 74ac6c51e77..a0e52c1c894 100644
> > --- a/src/loader/Makefile.am
> > +++ b/src/loader/Makefile.am
> > @@ -21,7 +21,7 @@
> >
> > include Makefile.sources
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> >
> > noinst_LTLIBRARIES = libloader.la
> >
> > diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
> > index 3f8fcc02e55..135e18aca1e 100644
> > --- a/src/mapi/Makefile.am
> > +++ b/src/mapi/Makefile.am
> > @@ -36,7 +36,12 @@ EXTRA_DIST = \
> > mapi_abi.py \
> > glapi/SConscript \
> > glapi/registry/gl.xml \
> > - shared-glapi/SConscript
> > + shared-glapi/SConscript \
> > + es1api/meson.build \
> > + es2api/meson.build \
> > + glapi/meson.build \
> > + shared-glapi/meson.build \
> > + meson.build
> >
> > AM_CFLAGS = \
> > $(PTHREAD_CFLAGS) \
> > diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
> > index 35e37e95a9f..93acabd968b 100644
> > --- a/src/mapi/glapi/gen/Makefile.am
> > +++ b/src/mapi/glapi/gen/Makefile.am
> > @@ -90,7 +90,8 @@ EXTRA_DIST= \
> > remap_helper.py \
> > static_data.py \
> > SConscript \
> > - gl_API.dtd
> > + gl_API.dtd \
> > + meson.build
> >
> > ######################################################################
> >
> > diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
> > index f2097eb209d..195e4400355 100644
> > --- a/src/mesa/Makefile.am
> > +++ b/src/mesa/Makefile.am
> > @@ -42,6 +42,9 @@ include Makefile.sources
> >
> > EXTRA_DIST = \
> > drivers/SConscript \
> > + main/meson.build \
> > + program/meson.build \
> > + meson.build \
> > main/format_fallback.py \
> > main/format_info.py \
> > main/format_pack.py \
> > diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
> > index 5cb2127501e..ae30996e028 100644
> > --- a/src/mesa/drivers/dri/Makefile.am
> > +++ b/src/mesa/drivers/dri/Makefile.am
> > @@ -72,6 +72,8 @@ mesa_dri_drivers_la_LIBADD = \
> > $(DRI_LIB_DEPS) \
> > $()
> >
> > +EXTRA_DIST = meson.build
> > +
> > if NEED_MEGADRIVER
> > dri_LTLIBRARIES = mesa_dri_drivers.la
> >
> > diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
> > index f26cc069381..192b3642b21 100644
> > --- a/src/mesa/drivers/dri/common/Makefile.am
> > +++ b/src/mesa/drivers/dri/common/Makefile.am
> > @@ -21,7 +21,7 @@
> >
> > include Makefile.sources
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> >
> > AM_CFLAGS = \
> > -I$(top_srcdir)/include \
> > diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
> > index 70ca0490a35..b66617ba82f 100644
> > --- a/src/mesa/drivers/dri/i915/Makefile.am
> > +++ b/src/mesa/drivers/dri/i915/Makefile.am
> > @@ -39,3 +39,5 @@ AM_CFLAGS = \
> > noinst_LTLIBRARIES = libi915_dri.la
> > libi915_dri_la_SOURCES = $(i915_FILES)
> > libi915_dri_la_LIBADD = $(I915_LIBS)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
> > index 319fdac489d..f1bfe968874 100644
> > --- a/src/mesa/drivers/dri/i965/Makefile.am
> > +++ b/src/mesa/drivers/dri/i965/Makefile.am
> > @@ -105,6 +105,7 @@ BUILT_SOURCES = $(i965_oa_GENERATED_FILES)
> > CLEANFILES = $(BUILT_SOURCES)
> >
> > EXTRA_DIST = \
> > + meson.build \
> > brw_oa_hsw.xml \
> > brw_oa_bdw.xml \
> > brw_oa_chv.xml \
> > @@ -117,7 +118,7 @@ EXTRA_DIST = \
> > brw_oa_glk.xml \
> > brw_oa_cflgt2.xml \
> > brw_oa_cflgt3.xml \
> > - brw_oa.py
> > + brw_oa.py
> >
> > # Note: we avoid using a multi target rule here and outputting both the
> > # .c and .h files in one go so we don't hit problems with parallel
> > diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
> > index 01e34a8e3c3..59fd7fce7c9 100644
> > --- a/src/mesa/drivers/dri/nouveau/Makefile.am
> > +++ b/src/mesa/drivers/dri/nouveau/Makefile.am
> > @@ -26,7 +26,8 @@ include Makefile.sources
> > EXTRA_DIST = \
> > nouveau_render_t.c \
> > nouveau_swtnl_t.c \
> > - nouveau_vbo_t.c
> > + nouveau_vbo_t.c \
> > + meson.build
> >
> > AM_CFLAGS = \
> > -I$(top_srcdir)/include \
> > diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
> > index 110c02ed27d..3d15c019909 100644
> > --- a/src/mesa/drivers/dri/r200/Makefile.am
> > +++ b/src/mesa/drivers/dri/r200/Makefile.am
> > @@ -24,7 +24,8 @@
> > include Makefile.sources
> >
> > EXTRA_DIST = \
> > - r200_maos_arrays.c
> > + r200_maos_arrays.c \
> > + meson.build
> >
> > AM_CFLAGS = \
> > -DRADEON_R200 \
> > diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
> > index aa898645c9d..9d43d2627fa 100644
> > --- a/src/mesa/drivers/dri/radeon/Makefile.am
> > +++ b/src/mesa/drivers/dri/radeon/Makefile.am
> > @@ -25,7 +25,8 @@ include Makefile.sources
> >
> > EXTRA_DIST = \
> > radeon_maos_verts.c \
> > - radeon_maos_arrays.c
> > + radeon_maos_arrays.c \
> > + meson.build
> >
> > AM_CFLAGS = \
> > -DRADEON_R100 \
> > diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
> > index 7e1ea59e9bd..110c056054b 100644
> > --- a/src/mesa/drivers/dri/swrast/Makefile.am
> > +++ b/src/mesa/drivers/dri/swrast/Makefile.am
> > @@ -38,3 +38,5 @@ AM_CFLAGS = \
> >
> > noinst_LTLIBRARIES = libswrast_dri.la
> > libswrast_dri_la_SOURCES = $(SWRAST_C_FILES)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
> > index 3c7def5c5c9..f7816995933 100644
> > --- a/src/mesa/drivers/osmesa/Makefile.am
> > +++ b/src/mesa/drivers/osmesa/Makefile.am
> > @@ -21,7 +21,7 @@
> > # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> > # IN THE SOFTWARE.
> >
> > -EXTRA_DIST = osmesa.def SConscript
> > +EXTRA_DIST = osmesa.def SConscript meson.build
> >
> > AM_CPPFLAGS = \
> > -I$(top_srcdir)/include \
> > diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
> > index 6e123ba1b35..c256ce0d34f 100644
> > --- a/src/mesa/drivers/x11/Makefile.am
> > +++ b/src/mesa/drivers/x11/Makefile.am
> > @@ -23,7 +23,7 @@
> > # GLX extension. All rendering is converted to Xlib calls. No hardware
> > # acceleration.
> >
> > -EXTRA_DIST = SConscript
> > +EXTRA_DIST = SConscript meson.build
> >
> > if HAVE_SHARED_GLAPI
> > SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
> > diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
> > index 47fce8a5b78..a8395d925bd 100644
> > --- a/src/mesa/main/tests/Makefile.am
> > +++ b/src/mesa/main/tests/Makefile.am
> > @@ -35,3 +35,5 @@ else
> > main_test_SOURCES += \
> > stubs.cpp
> > endif
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/util/Makefile.am b/src/util/Makefile.am
> > index 633907b9fdd..07bf052175b 100644
> > --- a/src/util/Makefile.am
> > +++ b/src/util/Makefile.am
> > @@ -83,7 +83,8 @@ EXTRA_DIST = \
> > merge_driinfo.py \
> > SConscript \
> > xmlpool.h \
> > - sha1/README
> > + sha1/README \
> > + meson.build
> >
> > PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> >
> > diff --git a/src/util/tests/hash_table/Makefile.am b/src/util/tests/hash_table/Makefile.am
> > index 8f12240cede..6b9221f8589 100644
> > --- a/src/util/tests/hash_table/Makefile.am
> > +++ b/src/util/tests/hash_table/Makefile.am
> > @@ -43,3 +43,5 @@ TESTS = \
> > $()
> >
> > check_PROGRAMS = $(TESTS)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/util/tests/string_buffer/Makefile.am b/src/util/tests/string_buffer/Makefile.am
> > index bd04d86349e..8bc8a9c9b6c 100644
> > --- a/src/util/tests/string_buffer/Makefile.am
> > +++ b/src/util/tests/string_buffer/Makefile.am
> > @@ -38,3 +38,5 @@ string_buffer_test_LDADD = \
> > $(top_builddir)/src/util/libmesautil.la \
> > $(PTHREAD_LIBS) \
> > $(DLOPEN_LIBS)
> > +
> > +EXTRA_DIST = meson.build
> > diff --git a/src/util/xmlpool/Makefile.am b/src/util/xmlpool/Makefile.am
> > index dfd8fb8dc6d..0ef7a5462a1 100644
> > --- a/src/util/xmlpool/Makefile.am
> > +++ b/src/util/xmlpool/Makefile.am
> > @@ -58,7 +58,8 @@ EXTRA_DIST = \
> > t_options.h \
> > $(POS) \
> > $(MOS) \
> > - SConscript
> > + SConscript \
> > + meson.build
> >
> > BUILT_SOURCES = options.h
> > CLEANFILES = \
> > diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
> > index 8766952eafb..037436c1cd7 100644
> > --- a/src/vulkan/Makefile.am
> > +++ b/src/vulkan/Makefile.am
> > @@ -11,7 +11,10 @@ PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
> >
> > EXTRA_DIST = \
> > $(top_srcdir)/include/vulkan/vk_android_native_buffer.h \
> > - util/gen_enum_to_str.py
> > + util/gen_enum_to_str.py \
> > + util/meson.build \
> > + wsi/meson.build \
> > + meson.build
> >
> > VULKAN_UTIL_SOURCES = \
> > $(VULKAN_UTIL_FILES) \
> > --
> > 2.15.1
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180118/363b21f4/attachment-0001.sig>
More information about the mesa-dev
mailing list