From 436ed65d38d4ed8b2a7b40fb2adeb15fb0d3989f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 17 Jan 2018 14:13:11 -0800 Subject: 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 Acked-by: Eric Engestrom Reviewed-by: Emil Velikov --- 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 | 2 ++ 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 ++ 19 files changed, 30 insertions(+), 11 deletions(-) (limited to 'src/gallium/drivers') 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 ace4e1d4e46..2bc129429c6 100644 --- 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 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 -- cgit v1.2.3