From 5150408da3e6779fb1fec324f5a279126d440031 Mon Sep 17 00:00:00 2001
From: Julien Isorce <julien.isorce@gmail.com>
Date: Fri, 2 May 2014 05:46:18 +0100
Subject: [PATCH] gl: rename cocoa example and move it to its parent directory

---
 tests/examples/gl/cocoa/.gitignore                 |  1 +
 tests/examples/gl/cocoa/Makefile.am                | 14 ++++++++++++--
 .../{videooverlay/main.m => cocoa-videooverlay.m}  |  0
 tests/examples/gl/cocoa/videooverlay/.gitignore    |  1 -
 tests/examples/gl/cocoa/videooverlay/Makefile.am   | 14 --------------
 5 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 tests/examples/gl/cocoa/.gitignore
 rename tests/examples/gl/cocoa/{videooverlay/main.m => cocoa-videooverlay.m} (100%)
 delete mode 100644 tests/examples/gl/cocoa/videooverlay/.gitignore
 delete mode 100755 tests/examples/gl/cocoa/videooverlay/Makefile.am

diff --git a/tests/examples/gl/cocoa/.gitignore b/tests/examples/gl/cocoa/.gitignore
new file mode 100644
index 0000000000..5cfb85ef2f
--- /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 716aa30e56..c13ec526e5 100755
--- 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
index c5ee310fbc..0000000000
--- 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
index 47dac610c0..0000000000
--- 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