multisocketsink: Re-add QoS DSCP property

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

diff --git a/Makefile.am b/Makefile.am
index e20dd34..b045c16 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,60 +1,90 @@
-if USE_GCONFTOOL
-GCONF_DIR=gconf
-else
-GCONF_DIR=
-endif
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
 if BUILD_EXTERNAL
-EXT_DIR=ext
+SUBDIRS_EXT = ext
 else
-EXT_DIR=
+SUBDIRS_EXT =
 endif
 
-if BUILD_EXAMPLES
-EXAMPLES_DIR=examples
-else
-EXAMPLES_DIR=
-endif
+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                   \
+       po                      \
+       common                  \
+       m4
+
+# include before EXTRA_DIST for win32 assignment
+include $(top_srcdir)/common/win32.mak
 
-SUBDIRS=gst-libs \
-       gst sys $(EXT_DIR) \
-       $(EXAMPLES_DIR) \
-       tools \
-       $(GCONF_DIR) \
-       testsuite \
-       po \
-       common \
-       m4 \
-       pkgconfig
-
-DIST_SUBDIRS=ext gst-libs \
-       gst sys \
-       examples \
-       tools \
-       gconf \
-       testsuite \
-       po \
-       common \
-       m4 \
-       pkgconfig
-
-EXTRA_DIST=gst-plugins.spec depcomp \
-          AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \
-          ChangeLog autogen.sh
-
-DISTCLEANFILES=_stdint.h
-
-# check that no marshal or enumtypes files are included
-# this in turn ensures that distcheck fails for missing .list files which is currently
-# shadowed when the corresponding .c and .h files are included.
-distcheck-hook:
-       @test "x" = "x`find $(distdir) -name \*-enumtypes.[ch]`" && \
-       test "x" = "x`find $(distdir) -name \*-marshal.[ch]`" || \
-       ( $(ECHO) "*** Leftover enumtypes or marshal files in the tarball." && \
-          $(ECHO) "*** Make sure the following files are not disted:" && \
-          find $(distdir) -name \*-enumtypes.[ch] && \
-          find $(distdir) -name \*-marshal.[ch] && \
-          false )
+EXTRA_DIST = \
+       gst-plugins-base.spec depcomp \
+       AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \
+       ChangeLog gst-plugins-base.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
+
+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_COPY = \
+       $(top_builddir)/gst-libs/gst/*/*-enumtypes.[ch] \
+       $(top_builddir)/_stdint.h
+
+win32-update:
+       for f in $(WIN32_COPY); do cp -v $$f win32/common; done; \
+       for f in win32/common/*-enumtypes.c; do \
+         echo "Indenting $$f"; \
+         gst-indent $$f; gst-indent $$f; \
+       done
+       cp -v $(top_builddir)/win32/common/config.h-new \
+           $(top_srcdir)/win32/common/config.h
+
+include $(top_srcdir)/common/coverage/lcov.mak
+
+check: check-exports
+
+# cruft: plugins that have been merged or moved or renamed
+
+CRUFT_FILES = \
+       $(top_builddir)/common/shave \
+       $(top_builddir)/common/shave-libtool \
+       $(top_builddir)/gst-libs/gst/audio/testchannels \
+       $(top_builddir)/tests/examples/audio/testchannels \
+       $(top_builddir)/tests/examples/volume/volume \
+       $(top_builddir)/tools/gst-discoverer
+
+CRUFT_DIRS = \
+       $(top_srcdir)/sys/v4l \
+       $(top_srcdir)/tests/examples/v4l
+
+include $(top_srcdir)/common/cruft.mak
+
+all-local: check-cruft