examples: Move seek example into its own directory
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 2 Mar 2012 10:57:34 +0000 (11:57 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 2 Mar 2012 10:57:34 +0000 (11:57 +0100)
configure.ac
tests/examples/Makefile.am
tests/examples/playback/Makefile.am [new file with mode: 0644]
tests/examples/playback/seek.c [moved from tests/examples/seek/seek.c with 100% similarity]
tests/examples/seek/Makefile.am

index 344ec29..8c35b5b 100644 (file)
@@ -1023,6 +1023,7 @@ tests/examples/gio/Makefile
 tests/examples/overlay/Makefile
 tests/examples/seek/Makefile
 tests/examples/snapshot/Makefile
+tests/examples/playback/Makefile
 tests/examples/playrec/Makefile
 tests/examples/v4l/Makefile
 tests/files/Makefile
index d765419..0f05e5a 100644 (file)
@@ -8,9 +8,13 @@ if USE_GIO
 GIO_SUBDIRS = gio
 endif
 
-SUBDIRS = app audio dynamic fft $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec v4l encoding
+if HAVE_GTK_X11
+GTK_SUBDIRS = playback
+endif
+
+SUBDIRS = app audio dynamic fft $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay $(GTK_SUBDIRS) playrec v4l encoding
 
-DIST_SUBDIRS = app audio dynamic fft gio overlay seek snapshot playrec v4l encoding
+DIST_SUBDIRS = app audio dynamic fft gio overlay seek snapshot playback playrec v4l encoding
 
 include $(top_srcdir)/common/parallel-subdirs.mak
 
diff --git a/tests/examples/playback/Makefile.am b/tests/examples/playback/Makefile.am
new file mode 100644 (file)
index 0000000..28d6f7e
--- /dev/null
@@ -0,0 +1,7 @@
+noinst_PROGRAMS = seek
+
+LDADD = \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
+       $(GST_LIBS) $(GTK_LIBS) $(LIBM)
+
+AM_CFLAGS = -I$(top_builddir)/gst-libs $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
index ae34780..4fe8955 100644 (file)
@@ -1,8 +1,8 @@
 if HAVE_GTK_X11
 if HAVE_LINUX_JOYSTICK_HEADERS
-GTK_EXAMPLES=seek scrubby jsseek
+GTK_EXAMPLES=scrubby jsseek
 else
-GTK_EXAMPLES=seek scrubby
+GTK_EXAMPLES=scrubby
 endif
 endif