Merge branch 'upstream/1.16' into tizen_gst_1.16.2
[platform/upstream/gst-plugins-base.git] / Makefile.am
index 21cdb5e..d81f733 100644 (file)
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS=--disable-gtk-doc
 
 if BUILD_EXTERNAL
 SUBDIRS_EXT = ext
@@ -10,20 +10,16 @@ SUBDIRS =                   \
        pkgconfig               \
        gst-libs                \
        gst sys $(SUBDIRS_EXT)  \
-       tools                   \
        tests                   \
-       docs                    \
        po                      \
        common                  \
        m4
 
 DIST_SUBDIRS =                         \
        pkgconfig               \
-       docs                    \
        gst-libs                \
        gst sys ext             \
-       tools                   \
-       tests                   \
+       tests \
        po                      \
        common                  \
        m4
@@ -74,8 +70,7 @@ CRUFT_FILES = \
        $(top_builddir)/tests/check/elements/gdpdepay \
        $(top_builddir)/tests/check/pipelines/streamheader \
        $(top_builddir)/tests/examples/audio/testchannels \
-       $(top_builddir)/tests/examples/volume/volume \
-       $(top_builddir)/tools/gst-discoverer
+       $(top_builddir)/tests/examples/volume/volume
 
 CRUFT_DIRS = \
        $(top_srcdir)/docs/design \