From 04ec48ca538dae44b9a0fb0d8e83100070de7998 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Tue, 18 Sep 2012 16:44:20 +0100
Subject: [PATCH] build the sdl examples when glib is disabled

This SDL example were unnecessarily including <glib.h> but they don't
actually depend on glib so now they are built even if Cogl is being
built with --disable-glib.

(cherry picked from commit 1d3bce7f68b0a6885c10a29cd9836a3541a1b653)
---
 examples/Makefile.am       | 23 ++++++++++++-----------
 examples/cogl-sdl-hello.c  |  1 -
 examples/cogl-sdl2-hello.c |  1 -
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index ef74da2f3..e667afb2c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -60,6 +60,18 @@ cogland_LDADD = $(common_ldadd)
 endif
 endif
 
+cogl_gles2_context_SOURCES = cogl-gles2-context.c
+cogl_gles2_context_LDADD = $(common_ldadd)
+
+if BUILD_COGL_GLES2
+programs += cogl-gles2-gears
+cogl_gles2_gears_SOURCES = cogl-gles2-gears.c
+cogl_gles2_gears_CFLAGS = -I$(top_srcdir)/cogl-gles2 $(AM_CFLAGS)
+cogl_gles2_gears_LDADD = $(common_ldadd) $(top_builddir)/cogl-gles2/libcogl-gles2.la
+endif
+
+endif #USE_GLIB
+
 if SUPPORT_SDL
 programs += cogl-sdl-hello
 cogl_sdl_hello_SOURCES = cogl-sdl-hello.c
@@ -72,17 +84,6 @@ cogl_sdl2_hello_SOURCES = cogl-sdl2-hello.c
 cogl_sdl2_hello_LDADD = $(common_ldadd)
 endif
 
-cogl_gles2_context_SOURCES = cogl-gles2-context.c
-cogl_gles2_context_LDADD = $(common_ldadd)
-
-if BUILD_COGL_GLES2
-programs += cogl-gles2-gears
-cogl_gles2_gears_SOURCES = cogl-gles2-gears.c
-cogl_gles2_gears_CFLAGS = -I$(top_srcdir)/cogl-gles2 $(AM_CFLAGS)
-cogl_gles2_gears_LDADD = $(common_ldadd) $(top_builddir)/cogl-gles2/libcogl-gles2.la
-endif
-
-endif #USE_GLIB
 
 if INSTALL_EXAMPLES
 bin_PROGRAMS = $(programs)
diff --git a/examples/cogl-sdl-hello.c b/examples/cogl-sdl-hello.c
index 41b99af2d..987cc131d 100644
--- a/examples/cogl-sdl-hello.c
+++ b/examples/cogl-sdl-hello.c
@@ -1,5 +1,4 @@
 #include <cogl/cogl.h>
-#include <glib.h>
 #include <stdio.h>
 #include <SDL.h>
 
diff --git a/examples/cogl-sdl2-hello.c b/examples/cogl-sdl2-hello.c
index 5df40ab33..972e7e1b0 100644
--- a/examples/cogl-sdl2-hello.c
+++ b/examples/cogl-sdl2-hello.c
@@ -1,5 +1,4 @@
 #include <cogl/cogl.h>
-#include <glib.h>
 #include <stdio.h>
 #include <SDL.h>