mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

Don't generate gst-element-check-1.0.m4 on the fly and fix meson build

Browse source 
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
This commit is contained in:
Tim-Philipp Müller 2017-05-04 21:37:28 +01:00
parent ecb0228cf0
commit 1b9aa6f70d
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.am
View file

@ -4,7 +4,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
ACLOCAL_AMFLAGS = -I m4 -I common/m4 ACLOCAL_AMFLAGS = -I m4 -I common/m4
aclocaldir = $(datadir)/aclocal aclocaldir = $(datadir)/aclocal
aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 aclocal_DATA = gst-element-check-1.0.m4
SUBDIRS = pkgconfig \ SUBDIRS = pkgconfig \
gst libs plugins tests \ gst libs plugins tests \
@ -31,7 +31,7 @@ DIST_SUBDIRS = pkgconfig \
include $(top_srcdir)/common/win32.mak include $(top_srcdir)/common/win32.mak
EXTRA_DIST = \ EXTRA_DIST = \
gst-element-check.m4 \ gst-element-check-1.0.m4 \
configure.ac autogen.sh depcomp \ configure.ac autogen.sh depcomp \
MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \ MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
scripts/gst-uninstalled \ scripts/gst-uninstalled \
@ -42,8 +42,6 @@ EXTRA_DIST = \
gst/parse/gen_lex.py.in gst/parse/gen_grammar.py.in \ gst/parse/gen_lex.py.in gst/parse/gen_grammar.py.in \
$(win32) $(win32)
CLEANFILES = gst-element-check-@GST_API_VERSION@.m4
DISTCLEANFILES = _stdint.h DISTCLEANFILES = _stdint.h
include $(top_srcdir)/common/release.mak include $(top_srcdir)/common/release.mak
@ -152,9 +150,6 @@ endif
check: $(CHECK_EXPORTS) check-enum-gettypes 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: plugins that have been merged or moved or renamed
CRUFT_FILES = \ CRUFT_FILES = \
@ -208,4 +203,4 @@ CRUFT_DIRS = \
include $(top_srcdir)/common/cruft.mak include $(top_srcdir)/common/cruft.mak
all-local: gst-element-check-@GST_API_VERSION@.m4 check-cruft all-local: check-cruft

0
gst-element-check.m4 → gst-element-check-1.0.m4
View file