diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-12-06 20:47:22 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-12-06 20:47:22 +0000 |
| commit | f5b7f57a1764820b312cb16cb24aa36f1db0ec33 (patch) | |
| tree | 12ba9c8b37f47e8605c22139d6d22934e6ea185e | |
| parent | 0dae3a007d25a2120a9d2cfaada6c5efc4cc2f5a (diff) | |
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
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | tests/Makefile.am | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index d663e61..4489fc9 100644 --- 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 --- 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 |