diff options
author | Dylan Baker <[email protected]> | 2018-01-17 14:13:11 -0800 |
---|---|---|
committer | Dylan Baker <[email protected]> | 2018-01-19 16:30:51 -0800 |
commit | 436ed65d38d4ed8b2a7b40fb2adeb15fb0d3989f (patch) | |
tree | fe11c6d05a084b2ae50c125c4f13f02c0655229d /src/gallium/targets | |
parent | 9d80ed0862154dba17fd558dd16b62e6bf43515f (diff) |
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]>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/d3dadapter9/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/dri/Makefile.am | 1 | ||||
-rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/omx-bellagio/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/osmesa/Makefile.am | 3 | ||||
-rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/va/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 3 | ||||
-rw-r--r-- | src/gallium/targets/xa/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/xvmc/Makefile.am | 2 |
11 files changed, 13 insertions, 10 deletions
diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index 159c8ea3527..c2aae0c7808 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -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 = diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index c54f7a69d0d..1d05d91a610 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -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 diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index 263b0846a42..1c622946a90 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -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 diff --git a/src/gallium/targets/omx-bellagio/Makefile.am b/src/gallium/targets/omx-bellagio/Makefile.am index 4c9a12c3c74..471ed85cd2c 100644 --- a/src/gallium/targets/omx-bellagio/Makefile.am +++ b/src/gallium/targets/omx-bellagio/Makefile.am @@ -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 diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index 7f55b1a13ea..de68a93ad53 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -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/ diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am index 2b4af57d5be..f8bee5ef673 100644 --- a/src/gallium/targets/osmesa/Makefile.am +++ b/src/gallium/targets/osmesa/Makefile.am @@ -86,7 +86,8 @@ EXTRA_DIST = \ osmesa.sym \ osmesa.def \ osmesa.mingw.def \ - SConscript + SConscript \ + meson.build include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 207aed0a253..4b84886f300 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -213,4 +213,4 @@ pipe_swrast_la_LIBADD += \ endif -EXTRA_DIST = pipe.sym +EXTRA_DIST = pipe.sym meson.build diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am index 453a1c32541..0f2fe14594b 100644 --- a/src/gallium/targets/va/Makefile.am +++ b/src/gallium/targets/va/Makefile.am @@ -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 diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index c1cd59621e1..2742c7acd44 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -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 = diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index cd9ca49f568..7b0e9006e06 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -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 diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 9f82d2605ed..45b1d860692 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -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 = |