From 6754c2e83d79f93b3a4c8c1c55ca4c5e3b965645 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 20 Apr 2018 18:52:55 -0700 Subject: [PATCH] autotools: Include new meson files Signed-off-by: Dylan Baker Reviewed-by: Kenneth Graunke --- src/compiler/Makefile.am | 1 + src/gallium/Makefile.am | 4 +++- src/gallium/tests/trivial/Makefile.am | 2 ++ src/gallium/tests/unit/Makefile.am | 2 ++ src/mesa/state_tracker/tests/Makefile.am | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) 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 -- 2.30.2