gstfunnel: avoid access of freed pad

[platform/upstream/gstreamer.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5317b24..671aec1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,16 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-docbook
 
 # note: keep in sync with configure.ac
-ACLOCAL_AMFLAGS = -I common/m4 -I .
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
+aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4
 
 SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
        docs \
        po \
+       m4 \
        common
 
 # These are all the possible subdirs
@@ -17,6 +18,7 @@ DIST_SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
        docs \
        po \
+       m4 \
        common
 
 # include before EXTRA_DIST for win32 assignment
@@ -24,14 +26,13 @@ include $(top_srcdir)/common/win32.mak
 
 EXTRA_DIST = \
        gstreamer.spec gstreamer.spec.in \
-       check-checks.m4 \
        gst-element-check.m4.in \
        configure.ac autogen.sh depcomp \
        MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
        scripts/gst-uninstalled \
        $(win32)
 
-CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4
+CLEANFILES = gst-element-check-@GST_API_VERSION@.m4
 
 DISTCLEANFILES = _stdint.h
 
@@ -139,27 +140,62 @@ include $(top_srcdir)/common/coverage/lcov.mak
 
 # Do not run the check-exports test in case any option which causes the API to
 # change has been used
-if !GST_DISABLE_GST_DEBUG
-if !GST_DISABLE_LOADSAVE
 if !GST_DISABLE_REGISTRY
 if !GST_DISABLE_TRACE
 CHECK_EXPORTS = check-exports
 endif
 endif
-endif
-endif
 
 check: $(CHECK_EXPORTS) check-enum-gettypes
 
-gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
-       $(AM_V_GEN)cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
+gst-element-check-@GST_API_VERSION@.m4: gst-element-check.m4
+       $(AM_V_GEN)cp gst-element-check.m4 gst-element-check-@GST_API_VERSION@.m4
 
 # cruft: plugins that have been merged or moved or renamed
 
 CRUFT_FILES = \
        $(top_builddir)/common/shave \
-       $(top_builddir)/common/shave-libtool
+       $(top_builddir)/common/shave-libtool \
+       $(top_builddir)/common/m4/codeset.m4 \
+       $(top_builddir)/common/m4/gettext.m4 \
+       $(top_builddir)/common/m4/glibc2.m4 \
+       $(top_builddir)/common/m4/glibc21.m4 \
+       $(top_builddir)/common/m4/iconv.m4 \
+       $(top_builddir)/common/m4/intdiv0.m4 \
+       $(top_builddir)/common/m4/intl.m4 \
+       $(top_builddir)/common/m4/intldir.m4 \
+       $(top_builddir)/common/m4/intlmacosx.m4 \
+       $(top_builddir)/common/m4/intmax.m4 \
+       $(top_builddir)/common/m4/inttypes-pri.m4 \
+       $(top_builddir)/common/m4/inttypes_h.m4 \
+       $(top_builddir)/common/m4/lcmessage.m4 \
+       $(top_builddir)/common/m4/lib-ld.m4 \
+       $(top_builddir)/common/m4/lib-link.m4 \
+       $(top_builddir)/common/m4/lib-prefix.m4 \
+       $(top_builddir)/common/m4/libtool.m4 \
+       $(top_builddir)/common/m4/lock.m4 \
+       $(top_builddir)/common/m4/longlong.m4 \
+       $(top_builddir)/common/m4/ltoptions.m4 \
+       $(top_builddir)/common/m4/ltsugar.m4 \
+       $(top_builddir)/common/m4/ltversion.m4 \
+       $(top_builddir)/common/m4/lt~obsolete.m4 \
+       $(top_builddir)/common/m4/nls.m4 \
+       $(top_builddir)/common/m4/po.m4 \
+       $(top_builddir)/common/m4/printf-posix.m4 \
+       $(top_builddir)/common/m4/progtest.m4 \
+       $(top_builddir)/common/m4/size_max.m4 \
+       $(top_builddir)/common/m4/stdint_h.m4 \
+       $(top_builddir)/common/m4/uintmax_t.m4 \
+       $(top_builddir)/common/m4/visibility.m4 \
+       $(top_builddir)/common/m4/wchar_t.m4 \
+       $(top_builddir)/common/m4/wint_t.m4 \
+       $(top_builddir)/common/m4/xsize.m4
+
+CRUFT_DIRS = \
+       $(top_builddir)/tests/examples/xml \
+       $(top_builddir)/gst/tmp-introspect* \
+       $(top_builddir)/libs/gst/*/tmp-introspect*
 
 include $(top_srcdir)/common/cruft.mak
 
-all-local: gst-element-check-@GST_MAJORMINOR@.m4 check-cruft
+all-local: gst-element-check-@GST_API_VERSION@.m4 check-cruft