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

Move conditional subdir include into top level.

Based on patch by: Joel Holdsworth

https://bugzilla.gnome.org/show_bug.cgi?id=757703

diff --git a/Makefile.am b/Makefile.am
index d663e61..4489fc9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,19 @@ else
 SUBDIRS_EXAMPLES =
 endif
 
-SUBDIRS =              \
+if BUILD_TESTS
+SUBDIRS_TESTS = tests
+else
+SUBDIRS_TESTS =
+endif
+
+SUBDIRS = \
        gst \
        common \
        pkgconfig \
        docs \
        $(SUBDIRS_EXAMPLES) \
-       tests
+       $(SUBDIRS_TESTS)
 
 DIST_SUBDIRS = gst common pkgconfig docs examples tests
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ca2ba66..f653107 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,14 +6,6 @@ AM_LDFLAGS = \
        $(GST_LIBS) \
        $(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_API_VERSION@.la
 
-if BUILD_TESTS
-SUBDIRS_CHECK = check
-else
-SUBDIRS_CHECK =
-endif
+SUBDIRS = check
 
-SUBDIRS =                      \
-       $(SUBDIRS_CHECK)
-
-DIST_SUBDIRS =                         \
-       check
+DIST_SUBDIRS = check