summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-04-20 18:52:55 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-04-20 20:26:56 -0700
commit6754c2e83d79f93b3a4c8c1c55ca4c5e3b965645 (patch)
treec3df02e7783a55aedde5875fc7854ef08c7c61d0
parent5c8e2501a66ce23872dcc09c43f43a4d8f560e88 (diff)
autotools: Include new meson files18.1-branchpoint
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/compiler/Makefile.am1
-rw-r--r--src/gallium/Makefile.am4
-rw-r--r--src/gallium/tests/trivial/Makefile.am2
-rw-r--r--src/gallium/tests/unit/Makefile.am2
-rw-r--r--src/mesa/state_tracker/tests/Makefile.am2
5 files changed, 10 insertions, 1 deletions
diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index 8ec9b0449ca..73435a3b5d6 100644
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -64,6 +64,7 @@ EXTRA_DIST = \
glsl/tests/meson.build \
glsl/meson.build \
nir/meson.build \
+ spirv/meson.build \
meson.build
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index e2e8eaece10..c153a5d44d9 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -206,4 +206,6 @@ endif
EXTRA_DIST += \
tests/graw \
tests/python \
- meson.build
+ meson.build \
+ tests/meson.build \
+ tests/graw/meson.build
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
index 585fb699e6c..db9a54ff0ad 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -19,5 +19,7 @@ tri_SOURCES = tri.c
quad_tex_SOURCES = quad-tex.c
+EXTRA_DIST = meson.build
+
clean-local:
-rm -f result.bmp
diff --git a/src/gallium/tests/unit/Makefile.am b/src/gallium/tests/unit/Makefile.am
index 9f1d3b98cde..f1192af17a6 100644
--- a/src/gallium/tests/unit/Makefile.am
+++ b/src/gallium/tests/unit/Makefile.am
@@ -32,3 +32,5 @@ u_format_test_SOURCES = u_format_test.c
u_format_compatible_test_SOURCES = u_format_compatible_test.c
translate_test_SOURCES = translate_test.c
+
+EXTRA_DIST = meson.build
diff --git a/src/mesa/state_tracker/tests/Makefile.am b/src/mesa/state_tracker/tests/Makefile.am
index cbb7447ee2c..a49ad3ee106 100644
--- a/src/mesa/state_tracker/tests/Makefile.am
+++ b/src/mesa/state_tracker/tests/Makefile.am
@@ -43,3 +43,5 @@ st_renumerate_test_LDADD = \
$(top_builddir)/src/gtest/libgtest.la \
$(GALLIUM_COMMON_LIB_DEPS) \
$(LLVM_LIBS)
+
+EXTRA_DIST = meson.build