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/glx/Makefile.am | 2 +- src/glx/tests/Makefile.am | 2 +- src/glx/windows/Makefile.am | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/glx') diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 5448a090764..5233257fb40 100644 --- 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 aab93e732a3..07173164f23 100644 --- 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 f4f8e9664d7..828a930e53f 100644 --- 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 -- cgit v1.2.3