avvidenc: pass Closed Caption metadata to libav

[platform/upstream/gst-libav.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5c62203..0938c74 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,33 +4,38 @@ COMMON_SUBDIRS = ext docs common tests
 SUBDIRS = $(LIBAV_SUBDIRS) $(COMMON_SUBDIRS) pkgconfig
 DIST_SUBDIRS = $(COMMON_SUBDIRS) gst-libs pkgconfig
 
-# include before EXTRA_DIST for win32 assignment
-include $(top_srcdir)/common/win32.mak
-
 EXTRA_DIST = \
-       gst-libav.spec depcomp autogen.sh \
+       depcomp autogen.sh \
        AUTHORS COPYING NEWS README ChangeLog gst-libav.doap \
-       $(win32)
+       meson_options.txt \
+       $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" )
 
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 include $(top_srcdir)/common/release.mak
 
+if HAVE_GST_CHECK
 check-valgrind:
-       @true
+       $(MAKE) -C tests/check check-valgrind
 
 check-torture:
-       @true
+       $(MAKE) -C tests/check torture
 
-if HAVE_GST_CHECK
 build-checks:
-       cd tests/check && make build-checks
+       $(MAKE) -C tests/check build-checks
 else
+check-valgrind:
+       echo "'check' library not installed, skipping"
+
+check-torture:
+       echo "'check' library not installed, skipping"
+
 build-checks:
-       true
+       echo "'check' library not installed, skipping"
 endif
 
 CRUFT_FILES = \
+       $(top_builddir)/gst-libav.spec \
        $(top_builddir)/common/shave \
        $(top_builddir)/common/shave-libtool \
        $(top_builddir)/common/m4/libtool.m4 \
@@ -39,6 +44,9 @@ CRUFT_FILES = \
        $(top_builddir)/common/m4/ltversion.m4 \
        $(top_builddir)/common/m4/lt~obsolete.m4
 
+CRUFT_DIRS = \
+       $(top_srcdir)/docs/plugins/tmpl
+
 include $(top_srcdir)/common/cruft.mak
 
 all-local: check-cruft