[i-g-t,7/7] meson: Distribute meson build system files

Commit Message

Petri Latvala Sept. 29, 2017, 12:59 p.m. UTC

Signed-off-by: Petri Latvala <[e-mail]>
---
 Makefile.am                      | 5 +++++
 assembler/Makefile.am            | 1 +
 benchmarks/Makefile.am           | 5 ++++-
 lib/Makefile.am                  | 5 +++++
 lib/tests/Makefile.am            | 4 ++++
 man/Makefile.am                  | 8 +++++++-
 overlay/Makefile.am              | 5 ++++-
 tests/Makefile.am                | 7 ++++++-
 tools/Makefile.am                | 3 +++
 tools/null_state_gen/Makefile.am | 4 ++++
 10 files changed, 43 insertions(+), 4 deletions(-)

Patch

diff --git a/Makefile.am b/Makefile.am
index 8c254027..eb5edb7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,3 +52,8 @@  ChangeLog:
 	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
+
+EXTRA_DIST = \
+	meson.build \
+	meson.sh \
+	$(NULL)
diff --git a/assembler/Makefile.am b/assembler/Makefile.am
index bed6c07c..855e33ab 100644
--- a/assembler/Makefile.am
+++ b/assembler/Makefile.am
@@ -153,6 +153,7 @@  CLEANFILES = $(BUILT_SOURCES) \
 EXTRA_DIST = \
 	README \
 	TODO \
+	meson.build \
 	intel-gen4asm.pc.in \
 	$(test_EXTRA_DIST) \
 	$(NULL)
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index 80c545ac..d066112a 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -23,4 +23,7 @@  gem_syslatency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
 gem_syslatency_LDADD = $(LDADD) -lpthread -lrt
 gem_wsim_LDADD = $(LDADD) -lpthread
 
-EXTRA_DIST=README
+EXTRA_DIST= \
+	README \
+	meson.build \
+	$(NULL)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a17027b9..30ddb92b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -85,3 +85,8 @@  libintel_tools_la_LIBADD = \
 	$(GLIB_LIBS) \
 	-lm
 
+EXTRA_DIST = \
+	dummy.c \
+	meson.build \
+	version.h.in \
+	$(NULL)
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 63bbbe59..3482dd44 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -19,3 +19,7 @@  LDADD = ../libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) $(LIBUNWIND_LIBS) $(T
 
 LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS) -lm
 AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS)
+
+EXTRA_DIST = \
+	meson.build \
+	$(NULL)
diff --git a/man/Makefile.am b/man/Makefile.am
index 0098fa45..777f5d1f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -22,7 +22,13 @@  if HAVE_RST2MAN
 appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX))
 endif
 
-EXTRA_DIST = $(appman_RST)
+EXTRA_DIST = \
+	$(appman_RST) \
+	defs.rst.in \
+	meson.build \
+	rst2man.sh \
+	$(NULL)
+
 CLEANFILES = $(appman_DATA) defs.rst
 
 SUFFIXES = .$(APP_MAN_SUFFIX)
diff --git a/overlay/Makefile.am b/overlay/Makefile.am
index 5472514e..39fbcc4e 100644
--- a/overlay/Makefile.am
+++ b/overlay/Makefile.am
@@ -67,4 +67,7 @@  intel_gpu_overlay_SOURCES += $(both_x11_sources)
 
 intel_gpu_overlay_LDADD = $(LDADD) -lrt
 
-EXTRA_DIST=README
+EXTRA_DIST= \
+	README \
+	meson.build \
+	$(NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1cea4036..89a97015 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -75,7 +75,12 @@  all-local: .gitignore
 	@echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.txt /.gitignore" | sed 's/\s\+/\n/g' | sort > $@
 
 EXTRA_PROGRAMS = $(HANG)
-EXTRA_DIST = $(common_files) $(check_SCRIPTS)
+EXTRA_DIST = \
+	$(common_files) \
+	$(check_SCRIPTS) \
+	generate_testlist.sh \
+	meson.build \
+	$(NULL)
 
 CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 35732c17..a8196f07 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -33,3 +33,6 @@  intel_aubdump_la_LIBADD = $(top_builddir)/lib/libintel_tools.la -ldl
 bin_SCRIPTS = intel_aubdump
 CLEANFILES = $(bin_SCRIPTS)
 
+EXTRA_DIST = \
+	meson.build \
+	$(NULL)
diff --git a/tools/null_state_gen/Makefile.am b/tools/null_state_gen/Makefile.am
index 24884a7f..2577dd88 100644
--- a/tools/null_state_gen/Makefile.am
+++ b/tools/null_state_gen/Makefile.am
@@ -28,3 +28,7 @@  states: intel_null_state_gen
 		echo "" >>$(h); \
 		./intel_null_state_gen $$gen >>$(h); \
 	done
+
+EXTRA_DIST = \
+	meson.build \
+	$(NULL)