X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=d81f73348465aa52ffab519fb5a1ea7f32c43840;hb=refs%2Fheads%2Ftizen;hp=828f2e39ef5854754fdfae91362dbc7a28c2fa44;hpb=68c0790817b4dedf8d4d028631e98d66171e73c0;p=platform%2Fupstream%2Fgst-plugins-base.git

diff --git a/Makefile.am b/Makefile.am
index 828f2e3..d81f733 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS=--disable-gtk-doc
 
 if BUILD_EXTERNAL
 SUBDIRS_EXT = ext
@@ -10,31 +10,27 @@ 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
 
-# include before EXTRA_DIST for win32 assignment
-include $(top_srcdir)/common/win32.mak
-
 EXTRA_DIST = \
-	gst-plugins-base.spec depcomp \
-	AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \
-	ChangeLog gst-plugins-base.doap autogen.sh $(win32)
+	depcomp \
+	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/gl/gstglconfig.h.meson \
+	meson_options.txt
 
 DISTCLEANFILES = _stdint.h
 
@@ -44,46 +40,45 @@ 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
 
-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)/gst-plugins-base.spec \
 	$(top_builddir)/common/shave \
 	$(top_builddir)/common/shave-libtool \
 	$(top_builddir)/gst-libs/gst/audio/testchannels \
+	$(top_builddir)/gst-libs/gst/app/gstapp-marshal.c \
+	$(top_builddir)/gst-libs/gst/app/gstapp-marshal.h \
+	$(top_builddir)/gst/encoding/.libs/libgstencodebin.so \
+	$(top_builddir)/tests/check/elements/gdppay \
+	$(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 \
+	$(top_srcdir)/docs/plugins/tmpl \
 	$(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