mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: disable all tests when --disable-tests is used

Browse source 
Move conditional subdir include into top level.

Based on patch by: Joel Holdsworth

https://bugzilla.gnome.org/show_bug.cgi?id=757703
This commit is contained in:
Tim-Philipp Müller 2017-12-06 20:47:22 +00:00
parent 0dae3a007d
commit f5b7f57a17
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -6,13 +6,19 @@ else
SUBDIRS_EXAMPLES = SUBDIRS_EXAMPLES =
endif endif
SUBDIRS = \ if BUILD_TESTS
SUBDIRS_TESTS = tests
else
SUBDIRS_TESTS =
endif
SUBDIRS = \
gst \ gst \
common \ common \
pkgconfig \ pkgconfig \
docs \ docs \
$(SUBDIRS_EXAMPLES) \ $(SUBDIRS_EXAMPLES) \
tests $(SUBDIRS_TESTS)
DIST_SUBDIRS = gst common pkgconfig docs examples tests DIST_SUBDIRS = gst common pkgconfig docs examples tests

12
tests/Makefile.am
View file

@ -6,14 +6,6 @@ AM_LDFLAGS = \
$(GST_LIBS) \ $(GST_LIBS) \
$(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_API_VERSION@.la $(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_API_VERSION@.la
if BUILD_TESTS SUBDIRS = check
SUBDIRS_CHECK = check
else
SUBDIRS_CHECK =
endif
SUBDIRS = \ DIST_SUBDIRS = check
$(SUBDIRS_CHECK)
DIST_SUBDIRS = \
check