Skip to content
Snippets Groups Projects
Commit 436ed65d authored by Dylan Baker's avatar Dylan Baker
Browse files

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: default avatarDylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
parent 9d80ed08
No related branches found
No related tags found
No related merge requests found
Showing
with 52 additions and 17 deletions
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment