autotools: include meson build files in tarball

This adds the meson.build, meson_options.txt, and a few scripts that are
used exclusively by the meson build.

v2: - Remove accidentally included changes needed to test make dist with
      LLVM > 3.9

Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/Makefile.am b/Makefile.am
index 929fbceed309e675c40c4c9f67e357f1b957bf74..5c3a6717d34e25c3eb42c4e389feb30b30938d24 100644 (file)
--- 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 ea530eca7d6d834679069eb19b39b6d4d73c0dd6..014ffaf3e29c8a0247729e8140503e6be35195b1 100644 (file)
--- 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 7d191af4431b21f561b9390465b99623507d0183..39cf0741ad931f4b1964c9711d18b5b84f32d8f1 100644 (file)
--- 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 a4e23cd28e0efd38f278aefc96b1e387082d9d68..6102596894271de08c3956570dfe84685ee6d8ab 100644 (file)
--- a/src/amd/vulkan/Makefile.am
+++ b/src/amd/vulkan/Makefile.am
@@ -146,7 +146,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 01b485e7d41b04be2a8deec5e5ffb177693149bc..35ed703a09535fca8c620c2e6e2c6ac1e15b096b 100644 (file)
--- 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 45b9cc58543eded44a78439c94372db362924a6d..9093fab6129502c8361e12c93751c70b3cfed04a 100644 (file)
--- 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 98d0420ec4db64d9bf3f44f2cdd0b1a86d3a430a..9fcee9d2b84aaceb9516dd1a4233d5aa9d20b11d 100644 (file)
--- 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 57782da936d993f0719d612e1604d6e4242cab02..7d1db23f4b9df017ae327562e87c8987b8078303 100644 (file)
--- 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 7dde9552f33d6d8936ce97d6777df68dbb6cd708..31dcca9e10f99a4a7e1b077cac3ec5b8a4c27692 100644 (file)
--- 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 ea20799eba6702c1e3f1416d4d06fc1b09d4a7a4..af010c89f8d9c513d03225395dc0ae88161c2b26 100644 (file)
--- 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 a64ead28e32a3f67319739808f8e38ff35e71679..95a325f96b3dc653083a319f3a6b79df25b7bc97 100644 (file)
--- 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 878159f234305351fd5752392bc137ba1a80eba9..718e5afad631589a60e50ae1c19f40d36f8cc495 100644 (file)
--- 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 f0e1662d0bd08a96fa47432bbd008343a466f0ae..b36ea239afceb85745553f7317a44df19909207c 100644 (file)
--- 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 654671133e5f5138c5872787998f616cc19ea0ca..81ef3c9f37010b2350f4a7d960b0a251c5aba444 100644 (file)
--- 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 5cb4c74cb6812f104786dc791916ea49450cfa4c..4e7bf2caeb8b434858a38b4ce3c5e631e8b90b14 100644 (file)
--- 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 eb3c964a37bf008208166b51bfdb394ab42ff9de..6209f66ef101756ef0f02925909f4e69c3a56637 100644 (file)
--- 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 562c2d6321c5331d2ee67181b887d6f0be498ada..d649fa44b9579561477aca33ab88f3ba95eaf530 100644 (file)
--- 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 dc1494b2a6d70adc7160ca95f05fd7031d8f89d8..1a4354e0b4d5e6457f4bdf964c384c7164519c79 100644 (file)
--- 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 c52d62e54a25d84d54fb15f45edf3a4fb61075ca..91547178e397e2b25b5c125574bb5b325e7d2977 100644 (file)
--- 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 081f332683eb0c67f58af2aa8a97ee7139d2b20d..26c75be32715375dc7f0856aa2e53cd65b9ff76f 100644 (file)
--- 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 6cb9307ade7e9688136b00776fdac3826631e811..bf45fbf7b20711a143c3723306925234bf46cb30 100644 (file)
--- 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 d5570926885b2004a015b41d9ec569e21abfc102..43dc35c239fabbddb848cd3980499b61409d4b5e 100644 (file)
--- 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 a30077020145054fd6e6ccf751cb43ecd998e637..8c701fa3b8b7236a3e93f459bf2e74dade834134 100644 (file)
--- 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 3e3cb86d6196f645ca3a6e849261ddc1601034e5..c784d84232e50c7138154e2eb77c0d490be57f2b 100644 (file)
--- 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 fd77edc51a166d1ecc11aea563c417de8ac01656..c8c2615a970f7400365ae5e0fd777a4ba1f7fda2 100644 (file)
--- 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 2e5220e9f271c76c3a18031fcf48dd6b0b6baa3c..a457df03c8cb8cbff3b1c12312b00fff03b19ce1 100644 (file)
--- 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 ace4e1d4e46924dfc58193255edf0c3dc14665a4..2bc129429c695864bdd0cd0642cab0f1661f4359 100644 (file)
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -359,6 +359,8 @@ endif
 
 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 5640192337e2575cb9f33bca1c8208f100709614..9c834a6d5264351cc37bcaba4f8280c22fe957cf 100644 (file)
--- 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 c3e49af975d623a3d6c8fd70d4831e095969f3bf..d65bf20e26d6186b98313fc1d5d60e2c0a74bd9c 100644 (file)
--- 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 b8f7e484b3474bcf9c733def7d5228bc6c846197..96cc9504488f91f6476086282c44187f85a40496 100644 (file)
--- 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 82d9756143f873cb220903d86b46e327a97893b0..e5e1d9ef6d988358db6187bd40de41c3ca21d90a 100644 (file)
--- 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 7167bc1c5cf12d0656e3d920532ed0767b9341e1..a7befb46059c4ec99dbdc7562b87751391d78a84 100644 (file)
--- 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 8b427f98acaf8423101eaa85e0ce72a1a5e496c2..d66e585b195d4acbbc601140cf1ec7352859c7d7 100644 (file)
--- 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 112030be486ce505ffbf79c286c023facc10954a..914d4a5b8856ff78b535954d1eb8de38a33bac65 100644 (file)
--- 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 c0c75b34c59ad50e411ff9a139147f91bc87e0e2..2a66df8b9e6b08ebc753b7d4d7d730ae54d8624a 100644 (file)
--- 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 fcd8b2c310e45c081b14ff78dd53093436e27d90..66f0f1e5e312d0e2f635d35f8a54a7c291aa2319 100644 (file)
--- 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 22e65c881e0242bbfc1a89b608f520ca1e3f39dd..e5f2a5e18a1796a65cfbdc61bd8147c525baa686 100644 (file)
--- 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 917839167bf8eb372e603f85514812fd1bde97c1..cd548e70b3583cbece330859cc0b92d6ca36aebc 100644 (file)
--- 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 e91b055177f473d347d31793b32681e92f8c7e7f..8bf8945b23840723a4a56dd8f378b0976e6cb993 100644 (file)
--- 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 1e51ec9cb89174cb724b3ecee8e4a6dddfcf469f..56ead63d3a49d317f585f34c7fbfdeabe110d549 100644 (file)
--- 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 398eaf6b6987004c4470ad41214ad73ebd652b1b..85d0b5f4953d95f713ee236b0b6d02fc27ac9a3c 100644 (file)
--- 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 159c8ea3527c9794d371d4334a83f62954093733..c2aae0c780864922e50dcd58527c810230226819 100644 (file)
--- 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 c54f7a69d0df360ffc25c09efc1eec83ac0c9fb6..1d05d91a6103b743ef4c35e6b4c8b08639d02e54 100644 (file)
--- 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 263b0846a42f526f94b90d67351d4fb022b1366f..1c622946a90ee55adff4a34ae8f93b951b78349a 100644 (file)
--- 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@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 4c9a12c3c7467f9640bf8ce65dcee02775c0c9ed..471ed85cd2c4edf5358fafc59f6c67a8a6e02ecd 100644 (file)
--- 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 7f55b1a13eafe7937cac0a6c5c8aace0efc3545f..de68a93ad537109ec9002653ad7e16c2a1c6d3c8 100644 (file)
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -42,7 +42,7 @@ nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp
 lib@OPENCL_LIBNAME@_la_SOURCES =
 
 EXTRA_lib@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 2b4af57d5bea304d8f29094ad4a9e4dc5f3fd373..f8bee5ef6735878e5ad79bd825754c9b9313f1a9 100644 (file)
--- 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 207aed0a253b397ec440be70d7190fb88a92e4ad..4b84886f30051ce8837c317be8806dae09bd3895 100644 (file)
--- 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 453a1c32541df8607934e10747d5bbe760412aa9..0f2fe14594b10c3c3e4c1d04fe690e22de8a2774 100644 (file)
--- 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 c1cd59621e1f1114f416a0f4bb14f1c11f7ca399..2742c7acd44dc8ba8fca972e391a04f2255c59c3 100644 (file)
--- 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 cd9ca49f5680bde92465d44aabaf8bebfbbaa337..7b0e9006e06dc746b9227020a1510ac966901555 100644 (file)
--- 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 9f82d2605ede866572ac4410327b652cd4310436..45b1d860692c31c881b28c0b25208b9dedc5e027 100644 (file)
--- 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 0889591f2979aeacc61c5c02c8538d0828a25762..e35fa2cd0a2a0afb8a22b5ace0e3137d6d76ba1c 100644 (file)
--- 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 ed04d9516cdc101ebf24f944db9f139291398bcc..3cc54c8ad13846a8c3bead5203fab7135c1f3c58 100644 (file)
--- 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 cf4c24cb81cf4aef19446aa1eaab6dd99371d424..e7e9a625c3ad856fc75d451d0f7c2aba5686b3d7 100644 (file)
--- 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 f7f11806492b8a5deb4a88219d15e279032cbf06..0b06f9df87651adfcb5dc1b16f962c4a8e41585d 100644 (file)
--- 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 ad3d0b79a9021b571aa103a0c9192c903f989d78..f15b531f81fe8da06be380c658998d2706df9143 100644 (file)
--- 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 9c94ea481919d37be3bbcd9f28bcc1a30593fc34..992fa25cc11c53365485e26541e3d59a06ac832f 100644 (file)
--- 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 34027dcbaad002e935713eb31676a0c8daad3052..148e912ef993cfd4df4266134875b585124b99b9 100644 (file)
--- 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 b413b0b93a0db80b676039fe4bf7e9b0010cbd05..c94c9b3a9c4a87e88680d5e4af4ae9157d290d04 100644 (file)
--- 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 ac9de18d3df01348c42bc56448de5e40062c3fb7..46bf5d85f9d8d05c4885eec1521ce11ee0034a39 100644 (file)
--- 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 a7d325383c9da75d93107f241b3dc3f81177f68e..ecf63d17da9ff264d1d9c5ad2baf6d22548994b1 100644 (file)
--- 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 8162553289d4c3c4fd113de5a596152b137173ed..022f3c508dac05f4c4e2734888074f6908961545 100644 (file)
--- 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 3da568442f819a8a7306539262b1884cebdadf0e..c2051891931661606279c593f51a59b2b4a5b1a6 100644 (file)
--- 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 7a9f1ce6e9bee80a561cd985eec1b579ae4ab249..7cd03a4c2b92cb01ad1acb9c393dd0fea3339485 100644 (file)
--- 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 c7ed33bc46c972ee3269587bacd8c10258b36c49..e518dda82f421a8c1e1933af43a81373af382844 100644 (file)
--- 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 3bbeb30f1df68442258349373448ee0bf9ce46ba..a32709bffaffc7c7c48c052965670c521d6f365a 100644 (file)
--- 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 fc5d1ca57701762d2a5f05ae29d4a26337949875..e8584036bf8fdee8481eecb86b990aae4711c949 100644 (file)
--- 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 2473b88ad6ed0f05af7171df2ca1db24380927bc..e543227e39e9c7d3f59462c1c68b21bed85afcca 100644 (file)
--- 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 b15a3afd60c5db4249a709f97c9cf3fe269c5905..0a31477a1f2b6031fe925db522c5cc1e5ae11d54 100644 (file)
--- 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 682c4281f4c1e7cd706761f0afacdedd78565f1d..5097212cda0aa54fb57c6fb07dd17a3747f4cbe7 100644 (file)
--- 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 5448a09076409795c251aabae42fcc5a85baaad6..5233257fb401d2bdcbf59854ecdd389982911191 100644 (file)
--- 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 aab93e732a3cb761441b2eb178e46dc372b86adc..07173164f234b291bc9b9852d1027c4576302b84 100644 (file)
--- 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 f4f8e9664d763b40a41c776586ec84aadd16becd..828a930e53f698bfebc4bdb6ba7f89ced5a95971 100644 (file)
--- 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 29d6c6d1998713195cb63057ba87a5c4f05f5abb..23b75536109374cf271167a02c48acccaa29c3e5 100644 (file)
--- 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 6a5e393f175a9362847d4aa5cfb184809be7d027..cde4a70fbc67db55bd6464a6793ce99548dac3e3 100644 (file)
--- 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 74ac6c51e771ae6e8c397cf37deaf84df7ea6174..a0e52c1c8941ca367ba9aa3dda0f0e716461e9f4 100644 (file)
--- 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 3f8fcc02e55e7c14431badfdf1e7703baf5fccb3..135e18aca1e2a37f4fe6f39cd4ff9275c6675a15 100644 (file)
--- 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 35e37e95a9fecc9ed60e76d05325fc65b6baf346..93acabd968bf9b926bba4ff567e2b1bdd88d3928 100644 (file)
--- 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 f2097eb209d44fd4f5205ad86fa2029b85332b03..195e44003559c50c5aa1f990d59391c03a9ccf8e 100644 (file)
--- 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 5cb2127501ed4705d58819bc9e9ac729be993377..ae30996e028e9dd0c1b1e41286a80227c40c9083 100644 (file)
--- 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 f26cc0693813d29ff433b032b47a69c7d6b53696..192b3642b21d6a3a15426ed1c615612ae74eba50 100644 (file)
--- 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 70ca0490a35fff300b140f85cdc7d9b7454302e8..b66617ba82f49ade18b5834c9bed9aa659ee5740 100644 (file)
--- 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 319fdac489db094e92b82e46c99635bf33d1f6a7..f1bfe9688741d6378e8201499f451d2c8809eaf7 100644 (file)
--- 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 01e34a8e3c3bd99a8a4c5035e013190b04113dc3..59fd7fce7c939af911151e5fc65660565866f1bd 100644 (file)
--- 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 110c02ed27d7f9483698ee09132758e051c5f459..3d15c019909cfa3fbeb38f8f2d83b58f8b11661a 100644 (file)
--- 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 aa898645c9df83810399506aeb0c4b03f164a3f1..9d43d2627faa3c6a8d0ab6df0624385f23f0b2af 100644 (file)
--- 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 7e1ea59e9bd7e9a7fb96a79caae76915cc7b003a..110c056054b4963fa70e36ba14d270e188a4930f 100644 (file)
--- 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 3c7def5c5c92287a4474bad34269fec1beb5fb3a..f78169959339d4625bdf82f54de4bf9ef693f53f 100644 (file)
--- 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 6e123ba1b3507e68335fdeef47d2c1723bcfc6f5..c256ce0d34f1288a77168429a5d8d391171348c2 100644 (file)
--- 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 47fce8a5b78df32efb11b354e36f9972e654f573..a8395d925bdc0f83725b95042814b13d6e32974f 100644 (file)
--- 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 633907b9fdd590ae40e11c3afe7097a09fa5b896..07bf052175b42dc27e54656d6ac90e6c606814da 100644 (file)
--- 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 8f12240cede47462ba1551267c2a6126ee638d58..6b9221f85899b4ae782228f96422bc7a910a8d66 100644 (file)
--- 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 bd04d86349e3cb95fbd7d5c8696d821f715e68ee..8bc8a9c9b6c8cf393e2a7e5d3bfd09372dd1279f 100644 (file)
--- 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 dfd8fb8dc6d9814b5bdd2a3161af6185b0cefeec..0ef7a5462a126fddf83bf3354488f5c8bfac4e3b 100644 (file)
--- 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 8766952eafb841ddb03ebe345d6b5a10f2e9b907..037436c1cd7dd9c24dd886ab9238c162d4007597 100644 (file)
--- 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) \