x264enc: remove leaking "optimization"

[glsdk/gst-plugins-ugly0-10.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e2546abded99ca55aa7af906e8330689d45b1c9a..08ceae8f854e9493f3eb5eb75b63b5d703768517 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,48 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
 SUBDIRS = \
-       gst ext docs m4 common
+       gst-libs gst ext docs m4 tests common pkgconfig po
 
+# include before EXTRA_DIST for win32 assignment
+include $(top_srcdir)/common/win32.mak
+       
 EXTRA_DIST = \
        gst-plugins-ugly.spec depcomp \
        AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
-       ChangeLog autogen.sh
+       ChangeLog gst-plugins-ugly.doap autogen.sh \
+       $(win32)
+       
 
 DISTCLEANFILES = _stdint.h
 
+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:
-       @true
+       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_builddir)/win32/common/config.h
+
+include $(top_srcdir)/common/coverage/lcov.mak
+
+# cruft: plugins that have been merged or moved or renamed
+
+CRUFT_FILES = \
+       $(top_builddir)/common/shave \
+       $(top_builddir)/common/shave-libtool
+
+include $(top_srcdir)/common/cruft.mak
+
+all-local: check-cruft