Move examples directory to tests/examples as in every other GStreamer module

43 files changed, 18 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index d7a9ef2ce..94bca7a28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,12 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-if BUILD_EXAMPLES
-SUBDIRS_EXAMPLES = examples
-else
-SUBDIRS_EXAMPLES =
-endif
-
 SUBDIRS = \
 	gst-libs gst sys ext \
-	m4 common docs tests po \
-	$(SUBDIRS_EXAMPLES)
+	m4 common docs tests po
 
 DIST_SUBDIRS = \
 	gst gst-libs sys ext \
-	m4 common docs tests po \
-	examples
+	m4 common docs tests po
 
 # include before EXTRA_DIST for win32 assignment
 include $(top_srcdir)/common/win32.mak
diff --git a/configure.ac b/configure.ac
index b0ddf9cfb..c4fabd96c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1495,10 +1495,10 @@ sys/wasapi/Makefile
 sys/wininet/Makefile
 sys/winks/Makefile
 sys/winscreencap/Makefile
-examples/Makefile
-examples/directfb/Makefile
-examples/scaletempo/Makefile
-examples/switch/Makefile
+tests/examples/Makefile
+tests/examples/directfb/Makefile
+tests/examples/scaletempo/Makefile
+tests/examples/switch/Makefile
 ext/amrwb/Makefile
 ext/alsaspdif/Makefile
 ext/assrender/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fb07e8e95..022b8d507 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,8 +4,17 @@ else
 SUBDIRS_CHECK =
 endif
 
+if BUILD_EXAMPLES
+SUBDIRS_EXAMPLES = examples
+else
+SUBDIRS_EXAMPLES =
+endif
+
 SUBDIRS = icles			\
-	$(SUBDIRS_CHECK)
+	$(SUBDIRS_CHECK)	\
+	$(SUBDIRS_EXAMPLES)
 
 DIST_SUBDIRS = icles		\
-	check
+	check			\
+	examples
+
diff --git a/examples/Makefile.am b/tests/examples/Makefile.am
index 323ced50e..323ced50e 100644
--- a/examples/Makefile.am
+++ b/tests/examples/Makefile.am
diff --git a/examples/app/.gitignore b/tests/examples/app/.gitignore
index 8a2c76152..8a2c76152 100644
--- a/examples/app/.gitignore
+++ b/tests/examples/app/.gitignore
diff --git a/examples/app/Makefile.am b/tests/examples/app/Makefile.am
index 4f3df7779..4f3df7779 100644
--- a/examples/app/Makefile.am
+++ b/tests/examples/app/Makefile.am
diff --git a/examples/app/appsink-src.c b/tests/examples/app/appsink-src.c
index a92dfb51f..a92dfb51f 100644
--- a/examples/app/appsink-src.c
+++ b/tests/examples/app/appsink-src.c
diff --git a/examples/app/appsrc-ra.c b/tests/examples/app/appsrc-ra.c
index aa4962fe5..aa4962fe5 100644
--- a/examples/app/appsrc-ra.c
+++ b/tests/examples/app/appsrc-ra.c
diff --git a/examples/app/appsrc-seekable.c b/tests/examples/app/appsrc-seekable.c
index 7137d13e1..7137d13e1 100644
--- a/examples/app/appsrc-seekable.c
+++ b/tests/examples/app/appsrc-seekable.c
diff --git a/examples/app/appsrc-stream.c b/tests/examples/app/appsrc-stream.c
index 870d707c7..870d707c7 100644
--- a/examples/app/appsrc-stream.c
+++ b/tests/examples/app/appsrc-stream.c
diff --git a/examples/app/appsrc-stream2.c b/tests/examples/app/appsrc-stream2.c
index 866b0504c..866b0504c 100644
--- a/examples/app/appsrc-stream2.c
+++ b/tests/examples/app/appsrc-stream2.c
diff --git a/examples/app/appsrc_ex.c b/tests/examples/app/appsrc_ex.c
index bc629fb01..bc629fb01 100644
--- a/examples/app/appsrc_ex.c
+++ b/tests/examples/app/appsrc_ex.c
diff --git a/examples/capsfilter/Makefile.am b/tests/examples/capsfilter/Makefile.am
index f8562fee7..f8562fee7 100644
--- a/examples/capsfilter/Makefile.am
+++ b/tests/examples/capsfilter/Makefile.am
diff --git a/examples/capsfilter/capsfilter1.c b/tests/examples/capsfilter/capsfilter1.c
index a59f728e5..a59f728e5 100644
--- a/examples/capsfilter/capsfilter1.c
+++ b/tests/examples/capsfilter/capsfilter1.c
diff --git a/examples/directfb/.gitignore b/tests/examples/directfb/.gitignore
index 5faebe918..5faebe918 100644
--- a/examples/directfb/.gitignore
+++ b/tests/examples/directfb/.gitignore
diff --git a/examples/directfb/Makefile.am b/tests/examples/directfb/Makefile.am
index 595a82ff6..595a82ff6 100644
--- a/examples/directfb/Makefile.am
+++ b/tests/examples/directfb/Makefile.am
diff --git a/examples/directfb/decker.ttf b/tests/examples/directfb/decker.ttf
index 5e721cfdd..5e721cfdd 100644
--- a/examples/directfb/decker.ttf
+++ b/tests/examples/directfb/decker.ttf
diff --git a/examples/directfb/dfblogo.png b/tests/examples/directfb/dfblogo.png
index 8b7d88336..8b7d88336 100644
--- a/examples/directfb/dfblogo.png
+++ b/tests/examples/directfb/dfblogo.png
diff --git a/examples/directfb/gstdfb.c b/tests/examples/directfb/gstdfb.c
index 675e5e23c..675e5e23c 100644
--- a/examples/directfb/gstdfb.c
+++ b/tests/examples/directfb/gstdfb.c
diff --git a/examples/gob/Makefile.am b/tests/examples/gob/Makefile.am
index 7abde4dc6..7abde4dc6 100644
--- a/examples/gob/Makefile.am
+++ b/tests/examples/gob/Makefile.am
diff --git a/examples/gob/gst-identity2.gob b/tests/examples/gob/gst-identity2.gob
index 9c34cb55f..9c34cb55f 100644
--- a/examples/gob/gst-identity2.gob
+++ b/tests/examples/gob/gst-identity2.gob
diff --git a/examples/gstplay/.gitignore b/tests/examples/gstplay/.gitignore
index a1eb1c433..a1eb1c433 100644
--- a/examples/gstplay/.gitignore
+++ b/tests/examples/gstplay/.gitignore
diff --git a/examples/gstplay/Makefile.am b/tests/examples/gstplay/Makefile.am
index cbae9cbf4..cbae9cbf4 100644
--- a/examples/gstplay/Makefile.am
+++ b/tests/examples/gstplay/Makefile.am
diff --git a/examples/gstplay/player.c b/tests/examples/gstplay/player.c
index 76453785f..76453785f 100644
--- a/examples/gstplay/player.c
+++ b/tests/examples/gstplay/player.c
diff --git a/examples/indexing/.gitignore b/tests/examples/indexing/.gitignore
index 5ce094731..5ce094731 100644
--- a/examples/indexing/.gitignore
+++ b/tests/examples/indexing/.gitignore
diff --git a/examples/indexing/Makefile.am b/tests/examples/indexing/Makefile.am
index 022bfc85b..022bfc85b 100644
--- a/examples/indexing/Makefile.am
+++ b/tests/examples/indexing/Makefile.am
diff --git a/examples/indexing/indexmpeg.c b/tests/examples/indexing/indexmpeg.c
index a670ad8af..a670ad8af 100644
--- a/examples/indexing/indexmpeg.c
+++ b/tests/examples/indexing/indexmpeg.c
diff --git a/examples/level/Makefile.am b/tests/examples/level/Makefile.am
index bf76136fc..bf76136fc 100644
--- a/examples/level/Makefile.am
+++ b/tests/examples/level/Makefile.am
diff --git a/examples/level/README b/tests/examples/level/README
index 0ae841886..0ae841886 100644
--- a/examples/level/README
+++ b/tests/examples/level/README
diff --git a/examples/level/demo.c b/tests/examples/level/demo.c
index 502f50f77..502f50f77 100644
--- a/examples/level/demo.c
+++ b/tests/examples/level/demo.c
diff --git a/examples/level/plot.c b/tests/examples/level/plot.c
index 6df01065c..44591584a 100644
--- a/examples/level/plot.c
+++ b/tests/examples/level/plot.c
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 
 gboolean got_channel[2] = { FALSE, FALSE };     /* to see if we got the signal for this one yet */
+
 gint channels = 0;              /* guess at how many channels there are */
 gdouble last_time = 0.0;        /* time of last signal */
 gdouble values[2][3];           /* array of levels from which to print */
diff --git a/examples/scaletempo/.gitignore b/tests/examples/scaletempo/.gitignore
index 1c56e1447..1c56e1447 100644
--- a/examples/scaletempo/.gitignore
+++ b/tests/examples/scaletempo/.gitignore
diff --git a/examples/scaletempo/Makefile.am b/tests/examples/scaletempo/Makefile.am
index 5cdf3c7f0..5cdf3c7f0 100644
--- a/examples/scaletempo/Makefile.am
+++ b/tests/examples/scaletempo/Makefile.am
diff --git a/examples/scaletempo/demo-gui.c b/tests/examples/scaletempo/demo-gui.c
index 01df9991a..01df9991a 100644
--- a/examples/scaletempo/demo-gui.c
+++ b/tests/examples/scaletempo/demo-gui.c
diff --git a/examples/scaletempo/demo-gui.h b/tests/examples/scaletempo/demo-gui.h
index b447d0d8b..b447d0d8b 100644
--- a/examples/scaletempo/demo-gui.h
+++ b/tests/examples/scaletempo/demo-gui.h
diff --git a/examples/scaletempo/demo-main.c b/tests/examples/scaletempo/demo-main.c
index 0902d7b26..0902d7b26 100644
--- a/examples/scaletempo/demo-main.c
+++ b/tests/examples/scaletempo/demo-main.c
diff --git a/examples/scaletempo/demo-player.c b/tests/examples/scaletempo/demo-player.c
index 3ed4b7187..3ed4b7187 100644
--- a/examples/scaletempo/demo-player.c
+++ b/tests/examples/scaletempo/demo-player.c
diff --git a/examples/scaletempo/demo-player.h b/tests/examples/scaletempo/demo-player.h
index ff521fc77..ff521fc77 100644
--- a/examples/scaletempo/demo-player.h
+++ b/tests/examples/scaletempo/demo-player.h
diff --git a/examples/stats/Makefile.am b/tests/examples/stats/Makefile.am
index 0f7d81cfe..0f7d81cfe 100644
--- a/examples/stats/Makefile.am
+++ b/tests/examples/stats/Makefile.am
diff --git a/examples/stats/mp2ogg.c b/tests/examples/stats/mp2ogg.c
index fc56d5b5b..fc56d5b5b 100644
--- a/examples/stats/mp2ogg.c
+++ b/tests/examples/stats/mp2ogg.c
diff --git a/examples/switch/.gitignore b/tests/examples/switch/.gitignore
index 7893c4354..7893c4354 100644
--- a/examples/switch/.gitignore
+++ b/tests/examples/switch/.gitignore
diff --git a/examples/switch/Makefile.am b/tests/examples/switch/Makefile.am
index 9a7060485..9a7060485 100644
--- a/examples/switch/Makefile.am
+++ b/tests/examples/switch/Makefile.am
diff --git a/examples/switch/switcher.c b/tests/examples/switch/switcher.c
index 4742c0337..4742c0337 100644
--- a/examples/switch/switcher.c
+++ b/tests/examples/switch/switcher.c