Commit 436ed65d authored by Dylan Baker's avatar Dylan Baker

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's avatarDylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
Reviewed-by: 's avatarEmil Velikov <emil.velikov@collabora.com>
parent 9d80ed08
......@@ -59,7 +59,12 @@ EXTRA_DIST = \
scons \
SConstruct \
build-support/conftest.dyn \
build-support/conftest.map
build-support/conftest.map \
meson.build \
meson_options.txt \
bin/meson.build \
include/meson.build \
bin/install_megadrivers.py
noinst_HEADERS = \
include/c99_alloca.h \
......
......@@ -26,7 +26,7 @@ git_sha1.h: $(top_srcdir)/src/git_sha1.h.in
BUILT_SOURCES = git_sha1.h
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = git_sha1.h.in
EXTRA_DIST = git_sha1.h.in meson.build
SUBDIRS = . gtest util mapi/glapi/gen mapi
......
......@@ -23,6 +23,13 @@ include Makefile.sources
noinst_LTLIBRARIES =
EXTRA_DIST = $(COMMON_HEADER_FILES) common/sid_tables.py
include Makefile.addrlib.am
include Makefile.common.am
EXTRA_DIST = \
$(COMMON_HEADER_FILES) \
common/sid_tables.py \
meson.build \
addrlib/meson.build \
common/meson.build \
vulkan/meson.build
......@@ -146,7 +146,8 @@ EXTRA_DIST = \
radv_extensions.py \
vk_format_layout.csv \
vk_format_parse.py \
vk_format_table.py
vk_format_table.py \
meson.build
libvulkan_radeon_la_LIBADD = $(VULKAN_LIB_DEPS)
......
......@@ -46,7 +46,12 @@ check_PROGRAMS =
TESTS =
BUILT_SOURCES =
CLEANFILES =
EXTRA_DIST = $(BROADCOM_FILES)
EXTRA_DIST = \
$(BROADCOM_FILES) \
meson.build \
cle/meson.build \
compiler/meson.build \
qpu/meson.build
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
......
......@@ -57,7 +57,14 @@ check_PROGRAMS =
TESTS =
BUILT_SOURCES =
CLEANFILES =
EXTRA_DIST = SConscript
EXTRA_DIST = \
SConscript \
glsl/glcpp/meson.build \
glsl/tests/meson.build \
glsl/meson.build \
nir/meson.build \
meson.build
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
......
......@@ -219,4 +219,5 @@ EXTRA_DIST = \
main/egl.def \
main/README.txt \
$(GLVND_GEN_DEPS) \
main/50_mesa.json
main/50_mesa.json \
meson.build
......@@ -10,7 +10,7 @@ libwayland_drm_la_SOURCES = \
wayland-drm-protocol.c
noinst_HEADERS = wayland-drm.h
EXTRA_DIST = wayland-drm.xml
EXTRA_DIST = wayland-drm.xml meson.build
BUILT_SOURCES = wayland-drm-protocol.c \
wayland-drm-client-protocol.h \
......
......@@ -17,7 +17,7 @@ libwayland_egl_la_LDFLAGS = \
TESTS = wayland-egl-symbols-check \
wayland-egl-abi-check
EXTRA_DIST = wayland-egl-symbols-check
EXTRA_DIST = wayland-egl-symbols-check meson.build
check_PROGRAMS = wayland-egl-abi-check
......
......@@ -207,4 +207,5 @@ endif
EXTRA_DIST += \
tests/graw \
tests/python
tests/python \
meson.build
......@@ -118,4 +118,5 @@ EXTRA_DIST = \
util/u_format.csv \
util/u_format_pack.py \
util/u_format_parse.py \
util/u_format_table.py
util/u_format_table.py \
meson.build
......@@ -48,4 +48,4 @@ libpipe_loader_dynamic_la_LIBADD = \
$(top_builddir)/src/loader/libloader.la \
$(top_builddir)/src/util/libxmlconfig.la
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -7,3 +7,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libddebug.la
libddebug_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -42,3 +42,5 @@ etnaviv_compiler_LDADD = \
$(top_builddir)/src/util/libmesautil.la \
$(GALLIUM_COMMON_LIB_DEPS) \
$(ETNAVIV_LIBS)
EXTRA_DIST = meson.build
......@@ -45,3 +45,5 @@ ir3_compiler_LDADD = \
$(top_builddir)/src/mesa/libmesagallium.la \
$(GALLIUM_COMMON_LIB_DEPS) \
$(FREEDRENO_LIBS)
EXTRA_DIST = meson.build
......@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la
libi915_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = TODO
EXTRA_DIST = meson.build
......@@ -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
......@@ -13,4 +13,4 @@ noinst_LTLIBRARIES = libnoop.la
libnoop_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -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
......@@ -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
......@@ -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
......@@ -27,3 +27,5 @@ libradeon_la_LDFLAGS = \
$(LLVM_LDFLAGS)
endif
EXTRA_DIST = meson.build
......@@ -47,3 +47,4 @@ si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
BUILT_SOURCES = $(GENERATED_SOURCES)
CLEANFILES = $(GENERATED_SOURCES)
EXTRA_DIST = meson.build
......@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = librbug.la
librbug_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript README
EXTRA_DIST = SConscript README meson.build
......@@ -31,4 +31,4 @@ noinst_LTLIBRARIES = libsoftpipe.la
libsoftpipe_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -37,4 +37,5 @@ libsvga_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript \
include/README \
svgadump/svga_dump.py
svgadump/svga_dump.py \
meson.build
......@@ -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 \
......
......@@ -11,4 +11,5 @@ libtrace_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript \
README \
trace.xsl
trace.xsl \
meson.build
......@@ -54,4 +54,4 @@ endif
libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
EXTRA_DIST = kernel/README
EXTRA_DIST = kernel/README meson.build
......@@ -52,3 +52,5 @@ libvc5_la_LIBADD = \
libvc5_v33.la \
libvc5_v41.la \
$()
EXTRA_DIST = meson.build
......@@ -30,3 +30,5 @@ AM_CPPFLAGS = \
noinst_LTLIBRARIES = libvirgl.la
libvirgl_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -60,4 +60,4 @@ libclover_la_LIBADD = \
libclover_la_SOURCES = $(CPP_SOURCES)
EXTRA_DIST = Doxyfile
EXTRA_DIST = Doxyfile meson.build
......@@ -51,4 +51,4 @@ if HAVE_DRI2
libdri_la_SOURCES += $(dri2_SOURCES)
endif
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -36,4 +36,4 @@ noinst_LTLIBRARIES = libxlib.la
libxlib_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -10,4 +10,4 @@ noinst_LTLIBRARIES = libninetracker.la
libninetracker_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = README
EXTRA_DIST = README meson.build
......@@ -33,3 +33,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libomxtracker.la
libomxtracker_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -40,4 +40,4 @@ noinst_LTLIBRARIES = libosmesa.la
libosmesa_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -34,3 +34,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libvatracker.la
libvatracker_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -40,3 +40,5 @@ AM_CPPFLAGS = \
noinst_LTLIBRARIES = libvdpautracker.la
libvdpautracker_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -38,4 +38,4 @@ noinst_LTLIBRARIES = libxatracker.la
libxatracker_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = README xa-indent.sh
EXTRA_DIST = README xa-indent.sh meson.build
......@@ -59,3 +59,5 @@ tests_test_rendering_SOURCES = tests/test_rendering.c tests/testlib.c
tests_test_rendering_LDADD = $(TEST_LIBS)
tests_xvmc_bench_SOURCES = tests/xvmc_bench.c tests/testlib.c
tests_xvmc_bench_LDADD = $(TEST_LIBS)
EXTRA_DIST = meson.build
......@@ -77,7 +77,7 @@ d3dadapter9_la_LIBADD = \
$(GALLIUM_COMMON_LIB_DEPS)
EXTRA_d3dadapter9_la_DEPENDENCIES = d3dadapter9.sym
EXTRA_DIST = d3dadapter9.sym
EXTRA_DIST = d3dadapter9.sym meson.build
TARGET_DRIVERS =
TARGET_CPPFLAGS =
......
......@@ -62,6 +62,7 @@ EXTRA_gallium_dri_la_DEPENDENCIES = \
$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
EXTRA_DIST = \
SConscript \
meson.build \
dri.sym \
$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
......
......@@ -83,6 +83,6 @@ AM_CPPFLAGS += -DGALLIUM_SWR
endif
EXTRA_lib@GL_LIB@_la_DEPENDENCIES = libgl-xlib.sym
EXTRA_DIST = SConscript libgl-xlib.sym
EXTRA_DIST = SConscript libgl-xlib.sym meson.build
include $(top_srcdir)/install-gallium-links.mk
......@@ -39,7 +39,7 @@ libomx_mesa_la_LIBADD += \
endif
EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym
EXTRA_DIST = omx.sym
EXTRA_DIST = omx.sym meson.build
if HAVE_GALLIUM_STATIC_TARGETS
......
......@@ -42,7 +42,7 @@ nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp
lib@OPENCL_LIBNAME@_la_SOURCES =
EXTRA_lib@OPENCL_LIBNAME@_la_DEPENDENCIES = opencl.sym
EXTRA_DIST = mesa.icd opencl.sym
EXTRA_DIST = mesa.icd opencl.sym meson.build
if HAVE_CLOVER_ICD
icddir = $(sysconfdir)/OpenCL/vendors/
......
......@@ -86,7 +86,8 @@ EXTRA_DIST = \
osmesa.sym \
osmesa.def \
osmesa.mingw.def \
SConscript
SConscript \
meson.build
include $(top_srcdir)/install-gallium-links.mk
......
......@@ -213,4 +213,4 @@ pipe_swrast_la_LIBADD += \
endif
EXTRA_DIST = pipe.sym
EXTRA_DIST = pipe.sym meson.build
......@@ -39,7 +39,7 @@ gallium_drv_video_la_LIBADD += \
endif
EXTRA_gallium_drv_video_la_DEPENDENCIES = va.sym
EXTRA_DIST = va.sym
EXTRA_DIST = va.sym meson.build
if HAVE_GALLIUM_STATIC_TARGETS
......
......@@ -44,7 +44,8 @@ EXTRA_libvdpau_gallium_la_DEPENDENCIES = \
$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
EXTRA_DIST = \
vdpau.sym \
$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn \
meson.build
TARGET_DRIVERS =
TARGET_CPPFLAGS =
......
......@@ -54,7 +54,7 @@ libxatracker_la_LDFLAGS += \
endif
EXTRA_libxatracker_la_DEPENDENCIES = xa.sym
EXTRA_DIST = xa.sym
EXTRA_DIST = xa.sym meson.build
if HAVE_GALLIUM_STATIC_TARGETS
......
......@@ -35,7 +35,7 @@ libXvMCgallium_la_LIBADD = \
$(GALLIUM_COMMON_LIB_DEPS)
EXTRA_libXvMCgallium_la_DEPENDENCIES = xvmc.sym
EXTRA_DIST = xvmc.sym
EXTRA_DIST = xvmc.sym meson.build
TARGET_DRIVERS =
TARGET_CPPFLAGS =
......
......@@ -14,3 +14,5 @@ libamdgpuwinsys_la_LIBADD = \
$(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -31,3 +31,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libetnavivdrm.la
libetnavivdrm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -31,3 +31,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libfreedrenodrm.la
libfreedrenodrm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -31,3 +31,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libi915drm.la
libi915drm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -31,3 +31,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libimxdrm.la
libimxdrm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -31,3 +31,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libnouveaudrm.la
libnouveaudrm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -32,3 +32,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libpl111drm.la
libpl111drm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -8,3 +8,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libradeonwinsys.la
libradeonwinsys_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -33,4 +33,4 @@ noinst_LTLIBRARIES = libsvgadrm.la
libsvgadrm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libswdri.la
libswdri_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -31,3 +31,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libswkmsdri.la
libswkmsdri_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libws_null.la
libws_null_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libwsw.la
libwsw_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -31,4 +31,4 @@ noinst_LTLIBRARIES = libws_xlib.la
libws_xlib_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
......@@ -29,3 +29,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libvc4drm.la
libvc4drm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -29,3 +29,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libvc5drm.la
libvc5drm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -31,3 +31,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libvirgldrm.la
libvirgldrm_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -30,3 +30,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libvirglvtest.la
libvirglvtest_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = meson.build
......@@ -52,6 +52,6 @@ libgbm_la_LIBADD += \
endif
TESTS = gbm-symbols-check
EXTRA_DIST = gbm-symbols-check
EXTRA_DIST = gbm-symbols-check meson.build
include $(top_srcdir)/install-lib-links.mk
......@@ -25,7 +25,7 @@ endif
SUBDIRS =
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
if HAVE_XF86VIDMODE
EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
......
......@@ -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 \
......
......@@ -32,3 +32,5 @@ libwindowsglx_la_CFLAGS = \
$(VISIBILITY_CFLAGS) \
$(DEFINES) \
$(X11_INCLUDES)
EXTRA_DIST = meson.build
......@@ -37,4 +37,5 @@ EXTRA_DIST = \
src/gtest-port.cc \
src/gtest-printers.cc \
src/gtest-test-part.cc \
src/gtest-typed-test.cc
src/gtest-typed-test.cc \
meson.build
......@@ -62,7 +62,15 @@ check_PROGRAMS =
TESTS =
BUILT_SOURCES =
CLEANFILES =
EXTRA_DIST =
EXTRA_DIST = \
blorp/meson.build \
common/meson.build \
compiler/meson.build \
genxml/meson.build \
isl/meson.build \
tools/meson.build \
vulkan/meson.build \
meson.build
include Makefile.blorp.am
include Makefile.common.am
......
......@@ -21,7 +21,7 @@
include Makefile.sources
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
noinst_LTLIBRARIES = libloader.la
......
......@@ -36,7 +36,12 @@ EXTRA_DIST = \
mapi_abi.py \
glapi/SConscript \
glapi/registry/gl.xml \
shared-glapi/SConscript
shared-glapi/SConscript \
es1api/meson.build \
es2api/meson.build \
glapi/meson.build \
shared-glapi/meson.build \
meson.build
AM_CFLAGS = \
$(PTHREAD_CFLAGS) \
......
......@@ -90,7 +90,8 @@ EXTRA_DIST= \
remap_helper.py \
static_data.py \
SConscript \
gl_API.dtd
gl_API.dtd \
meson.build
######################################################################
......
......@@ -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 \
......
......@@ -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
......
......@@ -21,7 +21,7 @@
include Makefile.sources
EXTRA_DIST = SConscript
EXTRA_DIST = SConscript meson.build
AM_CFLAGS = \
-I$(top_srcdir)/include \
......
......@@ -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
......@@ -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
......
......@@ -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 \
......
......@@ -24,7 +24,8 @@
include Makefile.sources
EXTRA_DIST = \
r200_maos_arrays.c
r200_maos_arrays.c \
meson.build
AM_CFLAGS = \
-DRADEON_R200 \
......