projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a8aaada
)
Ship meson build system in autotools generated tarballs
author
Sebastian Dröge
<sebastian@centricular.com>
Tue, 23 Jan 2018 17:32:18 +0000
(19:32 +0200)
committer
Sebastian Dröge
<sebastian@centricular.com>
Tue, 23 Jan 2018 17:32:18 +0000
(19:32 +0200)
Makefile.am
patch
|
blob
|
history
gi/Makefile.am
patch
|
blob
|
history
gi/overrides/Makefile.am
patch
|
blob
|
history
plugin/Makefile.am
patch
|
blob
|
history
testsuite/Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
bb1e00c
..
bd1ae25
100644
(file)
--- 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
eeba093
..
d91fac6
100644
(file)
--- 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
ee94f7c
..
bea5c32
100644
(file)
--- 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
26ef7d5
..
e6452e1
100644
(file)
--- 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
1933bcb
..
0ae0300
100644
(file)
--- 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 \