gl: rename cocoa example and move it to its parent directory

diff --git a/configure.ac b/configure.ac
index e73032f..99a97d6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3240,7 +3240,6 @@ tests/examples/camerabin2/Makefile
 tests/examples/directfb/Makefile
 tests/examples/gl/Makefile
 tests/examples/gl/cocoa/Makefile
-tests/examples/gl/cocoa/videooverlay/Makefile
 tests/examples/gl/clutter/Makefile
 tests/examples/gl/generic/Makefile
 tests/examples/gl/generic/cube/Makefile

diff --git a/tests/examples/gl/cocoa/.gitignore b/tests/examples/gl/cocoa/.gitignore
new file mode 100644 (file)
index 0000000..5cfb85e
--- /dev/null
+++ b/tests/examples/gl/cocoa/.gitignore
@@ -0,0 +1 @@
+cocoa-videooverlay

diff --git a/tests/examples/gl/cocoa/Makefile.am b/tests/examples/gl/cocoa/Makefile.am
index 716aa30..c13ec52 100755 (executable)
--- a/tests/examples/gl/cocoa/Makefile.am
+++ b/tests/examples/gl/cocoa/Makefile.am
@@ -1,4 +1,14 @@
-
 if HAVE_WINDOW_COCOA
-SUBDIRS = videooverlay
+
+noinst_PROGRAMS = cocoa-videooverlay
+
+cocoa_videooverlay_SOURCES = cocoa-videooverlay.m
+
+cocoa_videooverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
+       $(GL_CFLAGS) ${GL_OBJCFLAGS}
+cocoa_videooverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
+       $(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
+
+cocoa_videooverlay_LIBTOOLFLAGS = --tag=OBJC
+
 endif

diff --git a/tests/examples/gl/cocoa/videooverlay/main.m b/tests/examples/gl/cocoa/cocoa-videooverlay.m
similarity index 100%
rename from tests/examples/gl/cocoa/videooverlay/main.m
rename to tests/examples/gl/cocoa/cocoa-videooverlay.m

diff --git a/tests/examples/gl/cocoa/videooverlay/.gitignore b/tests/examples/gl/cocoa/videooverlay/.gitignore
deleted file mode 100644 (file)
index c5ee310..0000000
--- a/tests/examples/gl/cocoa/videooverlay/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-videooverlay

diff --git a/tests/examples/gl/cocoa/videooverlay/Makefile.am b/tests/examples/gl/cocoa/videooverlay/Makefile.am
deleted file mode 100755 (executable)
index 47dac61..0000000
--- a/tests/examples/gl/cocoa/videooverlay/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-if HAVE_WINDOW_COCOA
-
-noinst_PROGRAMS = videooverlay
-
-videooverlay_SOURCES = main.m
-
-videooverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
-       $(GL_CFLAGS) -I/usr/local/include/gstreamer-${GST_API_VERSION} ${GL_OBJCFLAGS}
-videooverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
-       $(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
-
-videooverlay_LIBTOOLFLAGS = --tag=OBJC
-
-endif