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 <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>

12 files changed, 22 insertions, 7 deletions

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