summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2018-01-23 13:04:57 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2018-01-23 14:25:34 +0000
commita9db8ac93508701d5681a7273460084939386ed7 (patch)
treeb698900bb884367922875206139af906aeae7aec
parent41e48eac8700944fa069254371b6f629fdbef1e7 (diff)
automake: small cleanup after the meson.build inclusion18.0-branchpoint
Namely extend the EXTRA_DIST list, instead of re-assigning it and bring back a file dropped by mistake. Fixes: 436ed65d38d ("autotools: include meson build files in tarball") Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--src/compiler/Makefile.am1
-rw-r--r--src/gallium/drivers/freedreno/Makefile.am2
-rw-r--r--src/gallium/drivers/i915/Makefile.am2
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am4
4 files changed, 4 insertions, 5 deletions
diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index 9093fab6129..fd6811ff26e 100644
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -64,7 +64,6 @@ EXTRA_DIST = \
glsl/meson.build \
nir/meson.build \
meson.build
-
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index 4e7bf2caeb8..3bcac39484a 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -46,4 +46,4 @@ ir3_compiler_LDADD = \
$(GALLIUM_COMMON_LIB_DEPS) \
$(FREEDRENO_LIBS)
-EXTRA_DIST = meson.build
+EXTRA_DIST += meson.build
diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am
index 6209f66ef10..261f292fd21 100644
--- a/src/gallium/drivers/i915/Makefile.am
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la
libi915_la_SOURCES = $(C_SOURCES)
-EXTRA_DIST = meson.build
+EXTRA_DIST = TODO meson.build
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index f1bfe968874..79be769c9b5 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -105,7 +105,6 @@ 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 \
@@ -118,7 +117,8 @@ EXTRA_DIST = \
brw_oa_glk.xml \
brw_oa_cflgt2.xml \
brw_oa_cflgt3.xml \
- brw_oa.py
+ brw_oa.py \
+ meson.build
# 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