Merge branch 'upstream/1.16' into tizen_gst_1.16.2

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

diff --git a/Makefile.am b/Makefile.am
index 912dd5e..d81f733 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,22 +24,13 @@ DIST_SUBDIRS =                      \
        common                  \
        m4
 
-# include before EXTRA_DIST for win32 assignment
-include $(top_srcdir)/common/win32.mak
-
 EXTRA_DIST = \
        depcomp \
-       AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \
-       ChangeLog gst-plugins-base.doap autogen.sh $(win32) \
+       AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
+       ChangeLog gst-plugins-base.doap autogen.sh \
        $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" ) \
-       gst-libs/gst/audio/audio_mkenum.py \
-       gst-libs/gst/app/app_mkenum.py \
-       gst-libs/gst/pbutils/pbutils_mkenum.py \
-       gst-libs/gst/rtp/rtp_mkenum.py \
-       gst-libs/gst/rtsp/rtsp_mkenum.py \
-       gst-libs/gst/tag/tag_mkenum.py \
-       gst-libs/gst/video/video_mkenum.py \
-       meson_options.txt config.h.meson
+       gst-libs/gst/gl/gstglconfig.h.meson \
+       meson_options.txt
 
 DISTCLEANFILES = _stdint.h
 
@@ -65,13 +56,10 @@ endif
 
 include $(top_srcdir)/common/coverage/lcov.mak
 
-check: check-exports
-
 # cruft: plugins that have been merged or moved or renamed
 
 CRUFT_FILES = \
        $(top_builddir)/gst-plugins-base.spec \
-       $(top_builddir)/win32/common/config.h-new \
        $(top_builddir)/common/shave \
        $(top_builddir)/common/shave-libtool \
        $(top_builddir)/gst-libs/gst/audio/testchannels \
@@ -90,6 +78,7 @@ CRUFT_DIRS = \
        $(top_srcdir)/ext/gio \
        $(top_srcdir)/gst/gdp \
        $(top_srcdir)/sys/v4l \
+       $(top_srcdir)/win32 \
        $(top_srcdir)/tests/examples/v4l
 
 include $(top_srcdir)/common/cruft.mak