Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tp-m committed May 4, 2017
1 parent ecb0228 commit 1b9aa6f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions Makefile.am
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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
Expand Down Expand Up @@ -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 = \
Expand Down Expand Up @@ -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
File renamed without changes.

0 comments on commit 1b9aa6f

Please sign in to comment.