diff --git a/tests/Makefile.am b/tests/Makefile.am
index e64090981295a27496d881b771932aeb6ddfb5aa..23ff192b73664da5639843777eef4e7f9899dd58 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-noinst_PROGRAMS = init loadall simplefake states
+EXTRA_DIST = README
-LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
+if BUILD_TESTS
+## SUBDIRS_TESTS = tests testsuite
+## FIXME: write tests from scratch
+SUBDIRS_TESTS =
+if HAVE_CHECK
+SUBDIRS_CHECK = check
+else
+SUBDIRS_CHECK =
+endif
+else
+SUBDIRS_TESTS =
+SUBDIRS_CHECK =
+endif
-INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
+if BUILD_EXAMPLES
+SUBDIRS_EXAMPLES = examples
+else
+SUBDIRS_EXAMPLES =
+endif
-EXTRA_DIST = README
+SUBDIRS = \
+ benchmarks \
+ $(SUBDIRS_CHECK) \
+ misc \
+ $(SUBDIRS_TESTS) \
+ $(SUBDIRS_EXAMPLES)
+
+# These are all the possible subdirs
+DIST_SUBDIRS = \
+ benchmarks \
+ check \
+ examples \
+ misc