diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-05-04 21:37:28 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-05-04 21:49:48 +0100 |
| commit | 1b9aa6f70dd1a2d9ffc4f0c095a4d5fcfbbb12e2 (patch) | |
| tree | f219384f574728f0146acf7e55e0d6b5e806f06d | |
| parent | ecb0228cf0e540a3bd93c60fd56dd23131f0e30b (diff) | |
Don't generate gst-element-check-1.0.m4 on the fly and fix meson build
This will interfere with 'git pull'. You will have to remove the
old generated gst-element-check-1.0.m4 manually if you're pulling
on a dirty build directory, sorry.
https://bugzilla.gnome.org/show_bug.cgi?id=782174
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | gst-element-check-1.0.m4 (renamed from gst-element-check.m4) | 0 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 83b16fe40..2120ad1a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc ACLOCAL_AMFLAGS = -I m4 -I common/m4 aclocaldir = $(datadir)/aclocal -aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 +aclocal_DATA = gst-element-check-1.0.m4 SUBDIRS = pkgconfig \ gst libs plugins tests \ @@ -31,7 +31,7 @@ DIST_SUBDIRS = pkgconfig \ include $(top_srcdir)/common/win32.mak EXTRA_DIST = \ - gst-element-check.m4 \ + gst-element-check-1.0.m4 \ configure.ac autogen.sh depcomp \ MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \ scripts/gst-uninstalled \ @@ -42,8 +42,6 @@ EXTRA_DIST = \ gst/parse/gen_lex.py.in gst/parse/gen_grammar.py.in \ $(win32) -CLEANFILES = gst-element-check-@GST_API_VERSION@.m4 - DISTCLEANFILES = _stdint.h include $(top_srcdir)/common/release.mak @@ -152,9 +150,6 @@ endif check: $(CHECK_EXPORTS) check-enum-gettypes -gst-element-check-@GST_API_VERSION@.m4: gst-element-check.m4 - $(AM_V_GEN)cp $(srcdir)/gst-element-check.m4 gst-element-check-@GST_API_VERSION@.m4 - # cruft: plugins that have been merged or moved or renamed CRUFT_FILES = \ @@ -208,4 +203,4 @@ CRUFT_DIRS = \ include $(top_srcdir)/common/cruft.mak -all-local: gst-element-check-@GST_API_VERSION@.m4 check-cruft +all-local: check-cruft diff --git a/gst-element-check.m4 b/gst-element-check-1.0.m4 index 9ad421f57..9ad421f57 100644 --- a/gst-element-check.m4 +++ b/gst-element-check-1.0.m4 |