X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=d9b3acaa5d09f777f4867eb3ccdf056c4190c20f;hb=dac5966da6a0f53d0443dfa1ac239289028c415d;hp=e39b86df5b0e08e0adb67537e7cba496fcf0812a;hpb=007a00cd1bb4dfacc7c5aefb71f54770c2d21093;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/Makefile.am b/Makefile.am
index e39b86d..d9b3aca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,22 @@
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-docbook
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
 # note: keep in sync with configure.ac
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
+aclocal_DATA = gst-element-check-1.0.m4
 
 SUBDIRS = pkgconfig \
-	gst libs plugins tools tests \
+	gst libs plugins tests \
 	docs \
 	po \
 	m4 \
-	common
+	common \
+	data
+
+if BUILD_TOOLS
+SUBDIRS += tools
+endif
 
 # These are all the possible subdirs
 DIST_SUBDIRS = pkgconfig \
@@ -19,20 +24,17 @@ DIST_SUBDIRS = pkgconfig \
 	docs \
 	po \
 	m4 \
-	common
-
-# include before EXTRA_DIST for win32 assignment
-include $(top_srcdir)/common/win32.mak
+	common \
+	data
 
 EXTRA_DIST = \
-	gstreamer.spec gstreamer.spec.in \
-	gst-element-check.m4.in \
+	gst-element-check-1.0.m4 \
 	configure.ac autogen.sh depcomp \
 	MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
 	scripts/gst-uninstalled \
-	$(win32)
-
-CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4
+	$(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/gstreamer-*" ) \
+	meson_options.txt \
+	gst/parse/gen_lex.py.in gst/parse/gen_grammar.py.in
 
 DISTCLEANFILES = _stdint.h
 
@@ -81,27 +83,23 @@ endif
 
 if HAVE_CHECK
 check-valgrind:
-	cd tests/check && make check-valgrind
+	$(MAKE) -C tests/check check-valgrind
 
 check-torture:
-	cd tests/check && make torture
+	$(MAKE) -C tests/check torture
+
+build-checks:
+	$(MAKE) -C tests/check build-checks
 else
 check-valgrind:
 	echo "'check' library not installed, skipping"
 
 check-torture:
 	echo "'check' library not installed, skipping"
-endif
 
-# FIXME: this target should be run every time we do "make release"
-# find a way of automating that
-win32-update:
-	for f in gstversion.h gstenumtypes.c gstenumtypes.h; do \
-		cp $(top_builddir)/gst/$$f win32/common; done
-	$(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c
-	$(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c
-	cp $(top_builddir)/win32/common/config.h-new \
-		$(top_srcdir)/win32/common/config.h
+build-checks:
+	echo "'check' library not installed, skipping"
+endif
 
 check-enum-gettypes: $(top_builddir)/gst/gstenumtypes.h
 	@echo 'Checking if all enum and flag _get_type() funcs are inited in gst_init()';                        \
@@ -138,22 +136,12 @@ check-enum-gettypes: $(top_builddir)/gst/gstenumtypes.h
 
 include $(top_srcdir)/common/coverage/lcov.mak
 
-# Do not run the check-exports test in case any option which causes the API to
-# change has been used
-if !GST_DISABLE_REGISTRY
-if !GST_DISABLE_TRACE
-CHECK_EXPORTS = check-exports
-endif
-endif
-
-check: $(CHECK_EXPORTS) check-enum-gettypes
-
-gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
-	$(AM_V_GEN)cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
+check: check-enum-gettypes
 
 # cruft: plugins that have been merged or moved or renamed
 
 CRUFT_FILES = \
+	$(top_builddir)/win32/common/config.h-new \
 	$(top_builddir)/common/shave \
 	$(top_builddir)/common/shave-libtool \
 	$(top_builddir)/common/m4/codeset.m4 \
@@ -193,9 +181,14 @@ CRUFT_FILES = \
 
 CRUFT_DIRS = \
 	$(top_builddir)/tests/examples/xml \
+	$(top_builddir)/tests/examples/launch \
+	$(top_builddir)/tests/examples/metadata \
+	$(top_builddir)/tests/examples/queue \
+	$(top_builddir)/tests/examples/typefind \
 	$(top_builddir)/gst/tmp-introspect* \
-	$(top_builddir)/libs/gst/*/tmp-introspect*
+	$(top_builddir)/libs/gst/*/tmp-introspect* \
+	$(top_srcdir)/docs/plugins/tmpl
 
 include $(top_srcdir)/common/cruft.mak
 
-all-local: gst-element-check-@GST_MAJORMINOR@.m4 check-cruft
+all-local: check-cruft