diff --git a/Makefile.am b/Makefile.am
index 2c87df6b0f0434355c211b583c260dd04a4ee7cd..08ceae8f854e9493f3eb5eb75b63b5d703768517 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
-if USE_GCONF
-GCONF_DIR=gconf
-else
-GCONF_DIR=
-endif
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+
+SUBDIRS = \
+ 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 gst-plugins-ugly.doap autogen.sh \
+ $(win32)
+
+
+DISTCLEANFILES = _stdint.h
+
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
-if BUILD_EXTERNAL
-EXT_DIR=ext
+include $(top_srcdir)/common/release.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
-EXT_DIR=
+check-torture:
+ true
endif
-SUBDIRS=gst-libs gst sys $(EXT_DIR) examples tools $(GCONF_DIR) ## testsuite
+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
-DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf ## testsuite
+include $(top_srcdir)/common/cruft.mak
-EXTRA_DIST=gst-plugins.spec depcomp AUTHORS COPYING README RELEASE ChangeLog autogen.sh
+all-local: check-cruft