From 83e0c2848806ae4745b49b46a577130440d73a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 2 Mar 2012 11:57:34 +0100 Subject: [PATCH] examples: Move seek example into its own directory --- configure.ac | 1 + tests/examples/Makefile.am | 8 ++++++-- tests/examples/playback/Makefile.am | 7 +++++++ tests/examples/{seek => playback}/seek.c | 0 tests/examples/seek/Makefile.am | 4 ++-- 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 tests/examples/playback/Makefile.am rename tests/examples/{seek => playback}/seek.c (100%) diff --git a/configure.ac b/configure.ac index 344ec29768..8c35b5b152 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am index d765419b34..0f05e5a1b8 100644 --- a/tests/examples/Makefile.am +++ b/tests/examples/Makefile.am @@ -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 -DIST_SUBDIRS = app audio dynamic fft gio overlay seek snapshot playrec v4l encoding +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 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 index 0000000000..28d6f7e9a1 --- /dev/null +++ b/tests/examples/playback/Makefile.am @@ -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) diff --git a/tests/examples/seek/seek.c b/tests/examples/playback/seek.c similarity index 100% rename from tests/examples/seek/seek.c rename to tests/examples/playback/seek.c diff --git a/tests/examples/seek/Makefile.am b/tests/examples/seek/Makefile.am index ae347802bd..4fe8955fee 100644 --- a/tests/examples/seek/Makefile.am +++ b/tests/examples/seek/Makefile.am @@ -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