matroskademux: track clip duration in segment

[platform/upstream/gst-plugins-good.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e1d6ac8..4247a97 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,9 @@ ALWAYS_SUBDIRS =              \
        tests                   \
        docs                    \
        po                      \
-       m4 common
+       common                  \
+       m4                      \
+       pkgconfig
 
 SUBDIRS =                      \
        $(ALWAYS_SUBDIRS)       \
@@ -21,10 +23,15 @@ DIST_SUBDIRS =                      \
        $(ALWAYS_SUBDIRS)       \
        gconf
 
+
+# include before EXTRA_DIST for win32 assignment
+include $(top_srcdir)/common/win32.mak
+
 EXTRA_DIST = \
        gst-plugins-good.spec depcomp \
        AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
-       ChangeLog autogen.sh
+       ChangeLog gst-plugins-good.doap autogen.sh \
+       $(win32)
 
 DISTCLEANFILES = _stdint.h
 
@@ -35,10 +42,22 @@ noinst_HEADERS = \
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 include $(top_srcdir)/common/release.mak
-# include $(top_srcdir)/common/po.mak
+include $(top_srcdir)/common/po.mak
 
 check-valgrind:
        cd tests/check && make check-valgrind
 
+if HAVE_GST_CHECK
 check-torture:
        cd tests/check && make torture
+else
+check-torture:
+       true
+endif
+
+win32-update:
+       cp $(top_builddir)/win32/common/config.h-new \
+           $(top_srcdir)/win32/common/config.h
+
+include $(top_srcdir)/common/coverage/lcov.mak
+