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

diff --git a/Makefile.am b/Makefile.am
index d7a9ef2..94bca7a 100644 (file)
--- 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 b0ddf9c..c4fabd9 100644 (file)
--- 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 fb07e8e..022b8d5 100644 (file)
--- 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
similarity index 100%
rename from examples/Makefile.am
rename to tests/examples/Makefile.am

diff --git a/examples/app/.gitignore b/tests/examples/app/.gitignore
similarity index 100%
rename from examples/app/.gitignore
rename to tests/examples/app/.gitignore

diff --git a/examples/app/Makefile.am b/tests/examples/app/Makefile.am
similarity index 100%
rename from examples/app/Makefile.am
rename to tests/examples/app/Makefile.am

diff --git a/examples/app/appsink-src.c b/tests/examples/app/appsink-src.c
similarity index 100%
rename from examples/app/appsink-src.c
rename to tests/examples/app/appsink-src.c

diff --git a/examples/app/appsrc-ra.c b/tests/examples/app/appsrc-ra.c
similarity index 100%
rename from examples/app/appsrc-ra.c
rename to tests/examples/app/appsrc-ra.c

diff --git a/examples/app/appsrc-seekable.c b/tests/examples/app/appsrc-seekable.c
similarity index 100%
rename from examples/app/appsrc-seekable.c
rename to tests/examples/app/appsrc-seekable.c

diff --git a/examples/app/appsrc-stream.c b/tests/examples/app/appsrc-stream.c
similarity index 100%
rename from examples/app/appsrc-stream.c
rename to tests/examples/app/appsrc-stream.c

diff --git a/examples/app/appsrc-stream2.c b/tests/examples/app/appsrc-stream2.c
similarity index 100%
rename from examples/app/appsrc-stream2.c
rename to tests/examples/app/appsrc-stream2.c

diff --git a/examples/app/appsrc_ex.c b/tests/examples/app/appsrc_ex.c
similarity index 100%
rename from examples/app/appsrc_ex.c
rename to tests/examples/app/appsrc_ex.c

diff --git a/examples/capsfilter/Makefile.am b/tests/examples/capsfilter/Makefile.am
similarity index 100%
rename from examples/capsfilter/Makefile.am
rename to tests/examples/capsfilter/Makefile.am

diff --git a/examples/capsfilter/capsfilter1.c b/tests/examples/capsfilter/capsfilter1.c
similarity index 100%
rename from examples/capsfilter/capsfilter1.c
rename to tests/examples/capsfilter/capsfilter1.c

diff --git a/examples/directfb/.gitignore b/tests/examples/directfb/.gitignore
similarity index 100%
rename from examples/directfb/.gitignore
rename to tests/examples/directfb/.gitignore

diff --git a/examples/directfb/Makefile.am b/tests/examples/directfb/Makefile.am
similarity index 100%
rename from examples/directfb/Makefile.am
rename to tests/examples/directfb/Makefile.am

diff --git a/examples/directfb/decker.ttf b/tests/examples/directfb/decker.ttf
similarity index 100%
rename from examples/directfb/decker.ttf
rename to tests/examples/directfb/decker.ttf

diff --git a/examples/directfb/dfblogo.png b/tests/examples/directfb/dfblogo.png
similarity index 100%
rename from examples/directfb/dfblogo.png
rename to tests/examples/directfb/dfblogo.png

diff --git a/examples/directfb/gstdfb.c b/tests/examples/directfb/gstdfb.c
similarity index 100%
rename from examples/directfb/gstdfb.c
rename to tests/examples/directfb/gstdfb.c

diff --git a/examples/gob/Makefile.am b/tests/examples/gob/Makefile.am
similarity index 100%
rename from examples/gob/Makefile.am
rename to tests/examples/gob/Makefile.am

diff --git a/examples/gob/gst-identity2.gob b/tests/examples/gob/gst-identity2.gob
similarity index 100%
rename from examples/gob/gst-identity2.gob
rename to tests/examples/gob/gst-identity2.gob

diff --git a/examples/gstplay/.gitignore b/tests/examples/gstplay/.gitignore
similarity index 100%
rename from examples/gstplay/.gitignore
rename to tests/examples/gstplay/.gitignore

diff --git a/examples/gstplay/Makefile.am b/tests/examples/gstplay/Makefile.am
similarity index 100%
rename from examples/gstplay/Makefile.am
rename to tests/examples/gstplay/Makefile.am

diff --git a/examples/gstplay/player.c b/tests/examples/gstplay/player.c
similarity index 100%
rename from examples/gstplay/player.c
rename to tests/examples/gstplay/player.c

diff --git a/examples/indexing/.gitignore b/tests/examples/indexing/.gitignore
similarity index 100%
rename from examples/indexing/.gitignore
rename to tests/examples/indexing/.gitignore

diff --git a/examples/indexing/Makefile.am b/tests/examples/indexing/Makefile.am
similarity index 100%
rename from examples/indexing/Makefile.am
rename to tests/examples/indexing/Makefile.am

diff --git a/examples/indexing/indexmpeg.c b/tests/examples/indexing/indexmpeg.c
similarity index 100%
rename from examples/indexing/indexmpeg.c
rename to tests/examples/indexing/indexmpeg.c

diff --git a/examples/level/Makefile.am b/tests/examples/level/Makefile.am
similarity index 100%
rename from examples/level/Makefile.am
rename to tests/examples/level/Makefile.am

diff --git a/examples/level/README b/tests/examples/level/README
similarity index 100%
rename from examples/level/README
rename to tests/examples/level/README

diff --git a/examples/level/demo.c b/tests/examples/level/demo.c
similarity index 100%
rename from examples/level/demo.c
rename to tests/examples/level/demo.c

diff --git a/examples/level/plot.c b/tests/examples/level/plot.c
similarity index 99%
rename from examples/level/plot.c
rename to tests/examples/level/plot.c
index 6df0106..4459158 100644 (file)
--- 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
similarity index 100%
rename from examples/scaletempo/.gitignore
rename to tests/examples/scaletempo/.gitignore

diff --git a/examples/scaletempo/Makefile.am b/tests/examples/scaletempo/Makefile.am
similarity index 100%
rename from examples/scaletempo/Makefile.am
rename to tests/examples/scaletempo/Makefile.am

diff --git a/examples/scaletempo/demo-gui.c b/tests/examples/scaletempo/demo-gui.c
similarity index 100%
rename from examples/scaletempo/demo-gui.c
rename to tests/examples/scaletempo/demo-gui.c

diff --git a/examples/scaletempo/demo-gui.h b/tests/examples/scaletempo/demo-gui.h
similarity index 100%
rename from examples/scaletempo/demo-gui.h
rename to tests/examples/scaletempo/demo-gui.h

diff --git a/examples/scaletempo/demo-main.c b/tests/examples/scaletempo/demo-main.c
similarity index 100%
rename from examples/scaletempo/demo-main.c
rename to tests/examples/scaletempo/demo-main.c

diff --git a/examples/scaletempo/demo-player.c b/tests/examples/scaletempo/demo-player.c
similarity index 100%
rename from examples/scaletempo/demo-player.c
rename to tests/examples/scaletempo/demo-player.c

diff --git a/examples/scaletempo/demo-player.h b/tests/examples/scaletempo/demo-player.h
similarity index 100%
rename from examples/scaletempo/demo-player.h
rename to tests/examples/scaletempo/demo-player.h

diff --git a/examples/stats/Makefile.am b/tests/examples/stats/Makefile.am
similarity index 100%
rename from examples/stats/Makefile.am
rename to tests/examples/stats/Makefile.am

diff --git a/examples/stats/mp2ogg.c b/tests/examples/stats/mp2ogg.c
similarity index 100%
rename from examples/stats/mp2ogg.c
rename to tests/examples/stats/mp2ogg.c

diff --git a/examples/switch/.gitignore b/tests/examples/switch/.gitignore
similarity index 100%
rename from examples/switch/.gitignore
rename to tests/examples/switch/.gitignore

diff --git a/examples/switch/Makefile.am b/tests/examples/switch/Makefile.am
similarity index 100%
rename from examples/switch/Makefile.am
rename to tests/examples/switch/Makefile.am

diff --git a/examples/switch/switcher.c b/tests/examples/switch/switcher.c
similarity index 100%
rename from examples/switch/switcher.c
rename to tests/examples/switch/switcher.c