volume: move volume example to audio

diff --git a/Makefile.am b/Makefile.am
index 00201ec..f96c417 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,7 @@ CRUFT_FILES = \
        $(top_builddir)/common/shave \
        $(top_builddir)/common/shave-libtool \
        $(top_builddir)/gst-libs/gst/audio/testchannels \
+       $(top_builddir)/tests/examples/volume/volume \
        $(top_builddir)/tools/gst-discoverer
 
 

diff --git a/configure.ac b/configure.ac
index 56eae4e..3247887 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1028,7 +1028,6 @@ tests/examples/overlay/Makefile
 tests/examples/seek/Makefile
 tests/examples/snapshot/Makefile
 tests/examples/playrec/Makefile
-tests/examples/volume/Makefile
 tests/examples/v4l/Makefile
 tests/files/Makefile
 tests/icles/Makefile

diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 14795db..8173142 100644 (file)
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -8,8 +8,9 @@ if USE_GIO
 GIO_SUBDIRS = gio
 endif
 
-SUBDIRS = app audio dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec volume v4l encoding
+SUBDIRS = app audio dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec v4l encoding
 
 DIST_SUBDIRS = app audio dynamic gio overlay seek snapshot playrec volume v4l encoding
 
 include $(top_srcdir)/common/parallel-subdirs.mak
+

diff --git a/tests/examples/audio/.gitignore b/tests/examples/audio/.gitignore
index 87308d7..04fcc59 100644 (file)
--- a/tests/examples/audio/.gitignore
+++ b/tests/examples/audio/.gitignore
@@ -1,3 +1,4 @@
 audiomix
 testchannels
+volume
 

diff --git a/tests/examples/audio/Makefile.am b/tests/examples/audio/Makefile.am
index 0b8d10a..d849234 100644 (file)
--- a/tests/examples/audio/Makefile.am
+++ b/tests/examples/audio/Makefile.am
@@ -1,5 +1,5 @@
 if HAVE_GTK
-GTK_EXAMPLES = audiomix
+GTK_EXAMPLES = audiomix volume
 else
 GTK_EXAMPLES =
 endif
@@ -15,4 +15,8 @@ if HAVE_GTK
 audiomix_SOURCES = audiomix.c
 audiomix_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -D_GNU_SOURCE
 audiomix_LDADD = $(GST_LIBS) $(GTK_LIBS) $(LIBM)
+
+volume_SOURCES = volume.c
+volume_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -D_GNU_SOURCE
+volume_LDADD = $(GST_LIBS) $(GTK_LIBS) $(LIBM)
 endif

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

diff --git a/tests/examples/volume/.gitignore b/tests/examples/volume/.gitignore
deleted file mode 100644 (file)
index 4833bbb..0000000
--- a/tests/examples/volume/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-volume

diff --git a/tests/examples/volume/Makefile.am b/tests/examples/volume/Makefile.am
deleted file mode 100644 (file)
index 7b2f067..0000000
--- a/tests/examples/volume/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-if HAVE_GTK
-noinst_PROGRAMS = volume
-volume_SOURCES = volume.c
-volume_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -D_GNU_SOURCE
-volume_LDADD = $(GST_LIBS) $(GTK_LIBS) $(LIBM)
-endif