Merge branch 'upstream/1.16' into tizen_gst_1.16.2

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

diff --git a/Makefile.am b/Makefile.am
index dba1721..a10917a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = \
        AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
        ChangeLog gst-plugins-good.doap autogen.sh \
        $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" ) \
-       meson_options.txt config.h.meson
+       meson_options.txt
 
 DISTCLEANFILES = _stdint.h
 
@@ -32,14 +32,18 @@ include $(top_srcdir)/common/release.mak
 include $(top_srcdir)/common/po.mak
 
 check-valgrind:
-       cd tests/check && make check-valgrind
+       $(MAKE) -C tests/check check-valgrind
 
 if HAVE_GST_CHECK
 check-torture:
-       cd tests/check && make torture
+       $(MAKE) -C tests/check torture
+build-checks:
+       $(MAKE) -C tests/check build-checks
 else
 check-torture:
        true
+build-checks:
+       true
 endif
 
 include $(top_srcdir)/common/coverage/lcov.mak
@@ -60,7 +64,9 @@ CRUFT_FILES = \
        $(top_builddir)/gst/videofilter/.libs/*videoflip.{so,dll,DLL,dylib} \
        $(top_builddir)/gst/videofilter/.libs/*videobalance.{so,dll,DLL,dylib} \
        $(top_builddir)/gst/videofilter/.libs/*gamma.{so,dll,DLL,dylib} \
-       $(top_builddir)/sys/oss4/.libs/libgstoss4audio.so
+       $(top_builddir)/sys/directsound/.libs/libgstdirectsoundsink.{dll,DLL} \
+       $(top_builddir)/sys/oss4/.libs/libgstoss4audio.so \
+       $(top_builddir)/sys/waveform/.libs/libgstwaveformsink.{dll,DLL}
 
 CRUFT_DIRS = \
        $(top_srcdir)/docs/plugins/tmpl \