projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
queue2: add overrun signal
[platform/upstream/gstreamer.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
e39b86d
..
503ffb3
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-4,14
+4,19
@@
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-docbook
ACLOCAL_AMFLAGS = -I m4 -I common/m4
aclocaldir = $(datadir)/aclocal
ACLOCAL_AMFLAGS = -I m4 -I common/m4
aclocaldir = $(datadir)/aclocal
-aclocal_DATA = gst-element-check-@GST_
MAJORMINOR
@.m4
+aclocal_DATA = gst-element-check-@GST_
API_VERSION
@.m4
SUBDIRS = pkgconfig \
SUBDIRS = pkgconfig \
- gst libs plugins t
ools t
ests \
+ gst libs plugins tests \
docs \
po \
m4 \
docs \
po \
m4 \
- common
+ common \
+ data
+
+if BUILD_TOOLS
+SUBDIRS += tools
+endif
# These are all the possible subdirs
DIST_SUBDIRS = pkgconfig \
# These are all the possible subdirs
DIST_SUBDIRS = pkgconfig \
@@
-19,20
+24,21
@@
DIST_SUBDIRS = pkgconfig \
docs \
po \
m4 \
docs \
po \
m4 \
- common
+ common \
+ data
# include before EXTRA_DIST for win32 assignment
include $(top_srcdir)/common/win32.mak
EXTRA_DIST = \
gstreamer.spec gstreamer.spec.in \
# include before EXTRA_DIST for win32 assignment
include $(top_srcdir)/common/win32.mak
EXTRA_DIST = \
gstreamer.spec gstreamer.spec.in \
- gst-element-check.m4
.in
\
+ gst-element-check.m4 \
configure.ac autogen.sh depcomp \
MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
scripts/gst-uninstalled \
$(win32)
configure.ac autogen.sh depcomp \
MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
scripts/gst-uninstalled \
$(win32)
-CLEANFILES = gst-element-check-@GST_
MAJORMINOR
@.m4
+CLEANFILES = gst-element-check-@GST_
API_VERSION
@.m4
DISTCLEANFILES = _stdint.h
DISTCLEANFILES = _stdint.h
@@
-81,16
+87,22
@@
endif
if HAVE_CHECK
check-valgrind:
if HAVE_CHECK
check-valgrind:
-
cd tests/check && make
check-valgrind
+
$(MAKE) -C tests/check
check-valgrind
check-torture:
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"
else
check-valgrind:
echo "'check' library not installed, skipping"
check-torture:
echo "'check' library not installed, skipping"
+
+build-checks:
+ echo "'check' library not installed, skipping"
endif
# FIXME: this target should be run every time we do "make release"
endif
# FIXME: this target should be run every time we do "make release"
@@
-148,8
+160,8
@@
endif
check: $(CHECK_EXPORTS) check-enum-gettypes
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
+gst-element-check-@GST_
API_VERSION
@.m4: gst-element-check.m4
+ $(AM_V_GEN)cp
$(srcdir)/gst-element-check.m4 gst-element-check-@GST_API_VERSION
@.m4
# cruft: plugins that have been merged or moved or renamed
# cruft: plugins that have been merged or moved or renamed
@@
-193,9
+205,14
@@
CRUFT_FILES = \
CRUFT_DIRS = \
$(top_builddir)/tests/examples/xml \
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)/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
include $(top_srcdir)/common/cruft.mak
-all-local: gst-element-check-@GST_
MAJORMINOR
@.m4 check-cruft
+all-local: gst-element-check-@GST_
API_VERSION
@.m4 check-cruft