From 2dd3bb0cb78634c35748643bf99529d867fa56ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 23 Jan 2018 19:32:18 +0200 Subject: [PATCH] Ship meson build system in autotools generated tarballs --- Makefile.am | 6 ++++++ gi/Makefile.am | 3 +++ gi/overrides/Makefile.am | 4 +++- plugin/Makefile.am | 3 +++ testsuite/Makefile.am | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index bb1e00cbba..bd1ae2538c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,3 +28,9 @@ CRUFT_FILES = \ include $(top_srcdir)/common/cruft.mak all-local: check-cruft + +EXTRA_DIST = \ + meson.build \ + meson_options.txt \ + config.h.meson \ + scripts/pythondetector diff --git a/gi/Makefile.am b/gi/Makefile.am index eeba093438..d91fac6fb3 100644 --- a/gi/Makefile.am +++ b/gi/Makefile.am @@ -1 +1,4 @@ SUBDIRS = overrides + +EXTRA_DIST = \ + meson.build diff --git a/gi/overrides/Makefile.am b/gi/overrides/Makefile.am index ee94f7c4a1..bea5c32a9c 100644 --- a/gi/overrides/Makefile.am +++ b/gi/overrides/Makefile.am @@ -8,7 +8,9 @@ pygioverrides_PYTHON = Gst.py GstPbutils.py pygioverridesexecdir = $(PYGI_OVERRIDES_DIR) -EXTRA_DIST = Gst.py +EXTRA_DIST = \ + meson.build \ + Gst.py AM_CPPFLAGS = $(PYTHON_INCLUDES) diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 26ef7d5994..e6452e1f8e 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -11,3 +11,6 @@ libgstpython_la_SOURCES = gstpythonplugin.c libgstpython_la_LDFLAGS = -avoid-version -shrext $(PYTHON_SO) libgstpython_la_LIBADD = $(PYTHON_LIBS) $(PYGOBJECT_LIBS) $(GST_LIBS) libgstpython_la_CFLAGS = $(GST_CFLAGS) $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(PYTHON_INCLUDES) + +EXTRA_DIST = \ + meson.build diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 1933bcb210..0ae0300031 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -6,6 +6,7 @@ tests = \ test_types.py EXTRA_DIST = \ + meson.build \ __init__.py \ common.py \ runtests.py \