summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac1
-rw-r--r--tests/Makefile.am10
3 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ae5d02e0..fbda9cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2006-04-28 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
+ * tests/Makefile.am:
+ add ximagesrc icles test
+
+2006-04-28 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * configure.ac:
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
diff --git a/configure.ac b/configure.ac
index 75c2e079..ede1f4eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -769,6 +769,7 @@ docs/plugins/Makefile
docs/version.entities
tests/Makefile
tests/check/Makefile
+tests/icles/Makefile
tests/examples/Makefile
tests/examples/level/Makefile
common/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index acdd17e0..a0a36114 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,13 @@ else
SUBDIRS_CHECK =
endif
-SUBDIRS = $(SUBDIRS_CHECK) examples
+if USE_X
+SUBDIRS_ICLES = icles
+else
+SUBDIRS_ICLES =
+endif
+
+SUBDIRS = $(SUBDIRS_CHECK) $(SUBDIRS_ICLES) examples
-DIST_SUBDIRS = check examples
+DIST_SUBDIRS = check icles examples