Back to development

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

diff --git a/Makefile.am b/Makefile.am
index d331c8d..dccba6e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,20 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
+if BUILD_EXAMPLES
+SUBDIRS_EXAMPLES = examples
+else
+SUBDIRS_EXAMPLES =
+endif
+
 SUBDIRS =              \
        gst \
        common \
        pkgconfig \
        docs \
-       examples \
+       $(SUBDIRS_EXAMPLES) \
        tests
 
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = gst common pkgconfig docs examples tests
 
 EXTRA_DIST = \
        ChangeLog autogen.sh depcomp \
@@ -26,13 +32,13 @@ include $(top_srcdir)/common/po.mak
 include $(top_srcdir)/common/coverage/lcov.mak
 
 check-valgrind:
-       cd tests/check && make check-valgrind
+       $(MAKE) -C tests/check check-valgrind
 
 if HAVE_CHECK
 check-torture:
-       cd tests/check && make torture
+       $(MAKE) -C tests/check torture
 build-checks:
-       cd tests/check && make build-checks
+       $(MAKE) -C tests/check  build-checks
 else
 check-torture:
        true